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

Remove iDziennik implementation [*]

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/compiler.xml

@@ -4,13 +4,14 @@
     <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.agendacalendarview" target="11" />
-      <module name="Szkolny.eu.app" target="1.8" />
+      <module name="Szkolny.eu.app" target="11" />
-      <module name="Szkolny.eu.cafebar" target="1.8" />
+      <module name="Szkolny.eu.cafebar" target="11" />
-      <module name="Szkolny.eu.material-about-library" target="1.8" />
+      <module name="Szkolny.eu.material-about-library" target="11" />
-      <module name="Szkolny.eu.mhttp" target="1.8" />
+      <module name="Szkolny.eu.mhttp" target="11" />
-      <module name="Szkolny.eu.nachos" target="1.8" />
+      <module name="Szkolny.eu.nachos" target="11" />
-      <module name="Szkolny.eu.szkolny-font" target="1.8" />
+      <module name="Szkolny.eu.szkolny-font" target="11" />
+      <module name="Szkolny.eu.wear" target="11" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/discord.xml

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

.idea/runConfigurations.xml

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

app/build.gradle

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

app/proguard/app.pro

@@ -64,6 +64,9 @@
 
 -keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); }
 
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
+-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
+-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
+
+-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
+-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }

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

@@ -1,10 +1,14 @@
-<h3>Wersja 4.3.1, 2020-08-27</h3>
+<h3>Wersja 4.6, 2021-02-26</h3>
 <ul>
-    <li>Dodana opcja automatycznej archiwizacji profilu na nowy rok szkolny.</li>
+    <li>Vulcan: aplikacja Szkolny.eu zaktualizowana w związku z wygaszeniem aplikacji Dzienniczek+.</li>
-    <li>Poprawione problemy z synchronizacją oraz mieszaniem się danych.</li>
+    <li>Vulcan: dodano wyświetlanie <b>szczęśliwego numerka.</b></li>
-    <li>Przywrócona synchronizacja w wakacje.</li>
+    <li>Vulcan: dodano możliwość logowania adresem e-mail lub nazwą użytkownika - wersja testowa.</li>
+    <li>Vulcan: usunięto wyświetlanie zadań domowych i sprawdzianów z poprzednich lat.</li>
+    <li>Mobidziennik: naprawiono otwieranie wysłanej wiadomości.</li>
+    <li>Mobidziennik: poprawiono wyświetlanie oraz liczenie e-obecności.</li>
+    <li>iDziennik: usunięto dziennik w związku z wygaszeniem systemu. [*]</li>
 </ul>
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>
-<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2020</i>
+<i>&copy; Kuba Szczodrzyński, Kacper Ziubryniewicz 2021</i>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x24, 0x85, 0x31, 0x5b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x9f, 0xff, 0x0f, 0x1f, 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

@@ -57,8 +57,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         val profileId
             get() = profile.id
 
-        var devMode = false
         var debugMode = false
+        var devMode = false
     }
 
     val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
@@ -107,7 +107,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .readTimeout(30, TimeUnit.SECONDS)
         builder.installHttpsSupport(this)
 
-        if (debugMode || BuildConfig.DEBUG) {
+        if (devMode || BuildConfig.DEBUG) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
@@ -162,7 +162,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
         Iconics.registerFont(SzkolnyFont)
         App.db = AppDb(this)
         Themes.themeInt = config.ui.theme
-        debugMode = config.debugMode
+        devMode = config.debugMode
         MHttp.instance().customOkHttpClient(http)
 
         if (!profileLoadById(config.lastProfileId)) {
@@ -173,9 +173,9 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             setLanguage(it)
         }
 
-        devMode = BuildConfig.DEBUG
+        debugMode = BuildConfig.DEBUG
         if (BuildConfig.DEBUG)
-            debugMode = true
+            devMode = true
 
         Signing.getCert(this)
 
@@ -185,7 +185,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
 
                 if (config.devModePassword != null)
                     checkDevModePassword()
-                debugMode = devMode || config.debugMode
+                devMode = debugMode || config.debugMode
 
                 if (config.sync.enabled)
                     SyncWorker.scheduleNext(this@App, false)
@@ -294,6 +294,19 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                         "Vulcan"
                 )
 
+                val pushVulcanHebeApp = FirebaseApp.initializeApp(
+                    this@App,
+                    FirebaseOptions.Builder()
+                        .setProjectId("dzienniczekplus")
+                        .setStorageBucket("dzienniczekplus.appspot.com")
+                        .setDatabaseUrl("https://dzienniczekplus.firebaseio.com")
+                        .setGcmSenderId("987828170337")
+                        .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
+                        .setApplicationId("1:987828170337:android:7e16404b9e5deaaa")
+                        .build(),
+                    "VulcanHebe"
+                )
+
                 try {
                     FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
                         val token = instanceIdResult.token
@@ -324,6 +337,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                             config.sync.tokenVulcanList = listOf()
                         }
                     }
+                    FirebaseInstanceId.getInstance(pushVulcanHebeApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        d("Firebase", "Got VulcanHebe token: $token")
+                        if (token != config.sync.tokenVulcanHebe) {
+                            config.sync.tokenVulcanHebe = token
+                            config.sync.tokenVulcanHebeList = listOf()
+                        }
+                    }
                     FirebaseMessaging.getInstance().subscribeToTopic(packageName)
                 } catch (e: IllegalStateException) {
                     e.printStackTrace()

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

@@ -43,10 +43,9 @@ 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.*
 import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
-import com.google.gson.JsonParser
 import im.wangchao.mhttp.Response
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -96,30 +95,30 @@ fun List<Teacher>.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull {
 
 fun JsonObject?.get(key: String): JsonElement? = this?.get(key)
 
-fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
+fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
-fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString }
+fun JsonObject?.getString(key: String): String? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
-fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt }
+fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
-fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong }
+fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
-fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat }
+fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
-fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
-fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue
+fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asBoolean } ?: defaultValue
-fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue
+fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asString } ?: defaultValue
-fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue
+fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asInt } ?: defaultValue
-fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue
+fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asLong } ?: defaultValue
-fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue
+fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asFloat } ?: defaultValue
-fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(it.isJsonNull) defaultValue else it.asCharacter } ?: defaultValue
+fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asCharacter } ?: defaultValue
 fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue
 fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue
 
-fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asBoolean }
+fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean }
-fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asString }
+fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asString }
-fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asInt }
+fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt }
-fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (it.isJsonNull) null else it.asLong }
+fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong }
-fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asFloat }
+fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat }
-fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(it.isJsonNull) null else it.asCharacter }
+fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter }
 fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null }
 fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null }
 
@@ -299,7 +298,7 @@ fun colorFromCssName(name: String): Int {
         "orange" -> 0xffffa500
         "black" -> 0xff000000
         "white" -> 0xffffffff
-        else -> -1
+        else -> -1L
     }.toInt()
 }
 
@@ -538,6 +537,12 @@ fun String.md5(): String {
     return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
 }
 
+fun String.sha1Hex(): String {
+    val md = MessageDigest.getInstance("SHA-1")
+    md.update(toByteArray())
+    return md.digest().joinToString("") { "%02x".format(it) }
+}
+
 fun String.sha256(): ByteArray {
     val md = MessageDigest.getInstance("SHA-256")
     md.update(toByteArray())
@@ -697,6 +702,21 @@ fun JsonObject(vararg properties: Pair<String, Any?>): JsonObject {
     }
 }
 
+fun JsonObject.toBundle(): Bundle {
+    return Bundle().also {
+        for ((key, value) in this.entrySet()) {
+            when (value) {
+                is JsonObject -> it.putBundle(key, value.toBundle())
+                is JsonPrimitive -> when {
+                    value.isString -> it.putString(key, value.asString)
+                    value.isBoolean -> it.putBoolean(key, value.asBoolean)
+                    value.isNumber -> it.putInt(key, value.asInt)
+                }
+            }
+        }
+    }
+}
+
 fun JsonArray(vararg properties: Any?): JsonArray {
     return JsonArray().apply {
         for (property in properties) {
@@ -1172,7 +1192,7 @@ fun Iterable<Float>.averageOrNull() = this.average().let { if (it.isNaN()) null
 fun String.copyToClipboard(context: Context) {
     val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
     val clipData = ClipData.newPlainText("Tekst", this)
-    clipboard.primaryClip = clipData
+    clipboard.setPrimaryClip(clipData)
 }
 
 fun TextView.getTextPosition(range: IntRange): Rect {

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

@@ -38,9 +38,12 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.droidsonroids.gif.GifDrawable
+import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
@@ -48,7 +51,9 @@ 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
@@ -60,6 +65,7 @@ import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
 import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
 import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
@@ -228,7 +234,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES)
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
-            if (App.debugMode) {
+            if (App.devMode) {
                 list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
                 list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
                         .withIcon(CommunityMaterial.Icon.cmd_flask_outline)
@@ -438,7 +444,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,
@@ -562,7 +568,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                         .withIcon(CommunityMaterial.Icon2.cmd_help_circle_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(TARGET_FEEDBACK) })
         )
-        if (App.debugMode) {
+        if (App.devMode) {
             bottomSheet += BottomSheetPrimaryItem(false)
                     .withTitle(R.string.menu_debug)
                     .withIcon(CommunityMaterial.Icon.cmd_android_studio)
@@ -604,7 +610,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
          |_____/ \__, |_| |_|\___|
                   __/ |
                  |__*/
-    fun syncCurrentFeature() {
+    suspend fun syncCurrentFeature() {
         if (app.profile.archived) {
             MaterialAlertDialogBuilder(this)
                     .setTitle(R.string.profile_archived_title)
@@ -640,6 +646,30 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             swipeRefreshLayout.isRefreshing = false
             return
         }
+
+        app.profile.registerName?.let { registerName ->
+            var status = app.config.sync.registerAvailability[registerName]
+            if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                withContext(Dispatchers.IO) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching(this@MainActivity) {
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }
+                }
+            }
+
+            if (status?.available != true
+                    || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                swipeRefreshLayout.isRefreshing = false
+                loadTarget(DRAWER_ITEM_HOME)
+                if (status != null)
+                    RegisterUnavailableDialog(this, status!!)
+                return
+            }
+        }
+
         swipeRefreshLayout.isRefreshing = true
         Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show()
         val fragmentParam = when (navTargetId) {
@@ -656,6 +686,20 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 arguments = arguments
         ).enqueue(this)
     }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onUpdateEvent(event: Update) {
+        EventBus.getDefault().removeStickyEvent(event)
+        UpdateAvailableDialog(this, event)
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
+        EventBus.getDefault().removeStickyEvent(event)
+        app.profile.registerName?.let { registerName ->
+            event.data[registerName]?.let {
+                RegisterUnavailableDialog(this, it)
+            }
+        }
+    }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) {
         swipeRefreshLayout.isRefreshing = true
@@ -707,6 +751,11 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) {
         EventBus.getDefault().removeStickyEvent(event)
+        if (event.error.errorCode == ERROR_VULCAN_API_DEPRECATED) {
+            if (event.error.profileId != App.profileId)
+                return
+            ErrorDetailsDialog(this, listOf(event.error))
+        }
         navView.toolbar.apply {
             subtitleFormat = R.string.toolbar_subtitle
             subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread

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

@@ -105,6 +105,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() }
         set(value) { set("widgetConfigs", value); mWidgetConfigs = value }
 
+    private var mArchiverEnabled: Boolean? = null
+    var archiverEnabled: Boolean
+        get() { mArchiverEnabled = mArchiverEnabled ?: values.get("archiverEnabled", true); return mArchiverEnabled ?: true }
+        set(value) { set("archiverEnabled", value); mArchiverEnabled = value }
+
     private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
     private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
     init {

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

@@ -4,12 +4,18 @@
 
 package pl.szczodrzynski.edziennik.config
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.config.utils.setMap
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class ConfigSync(private val config: Config) {
+    private val gson = Gson()
+
     private var mDontShowAppManagerDialog: Boolean? = null
     var dontShowAppManagerDialog: Boolean
         get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false }
@@ -93,6 +99,10 @@ class ConfigSync(private val config: Config) {
     var tokenVulcan: String?
         get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan }
         set(value) { config.set("tokenVulcan", value); mTokenVulcan = value }
+    private var mTokenVulcanHebe: String? = null
+    var tokenVulcanHebe: String?
+        get() { mTokenVulcanHebe = mTokenVulcanHebe ?: config.values.get("tokenVulcanHebe", null as String?); return mTokenVulcanHebe }
+        set(value) { config.set("tokenVulcanHebe", value); mTokenVulcanHebe = value }
 
     private var mTokenMobidziennikList: List<Int>? = null
     var tokenMobidziennikList: List<Int>
@@ -106,4 +116,13 @@ class ConfigSync(private val config: Config) {
     var tokenVulcanList: List<Int>
         get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() }
         set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value }
+    private var mTokenVulcanHebeList: List<Int>? = null
+    var tokenVulcanHebeList: List<Int>
+        get() { mTokenVulcanHebeList = mTokenVulcanHebeList ?: config.values.getIntList("tokenVulcanHebeList", listOf()); return mTokenVulcanHebeList ?: listOf() }
+        set(value) { config.set("tokenVulcanHebeList", value); mTokenVulcanHebeList = value }
+
+    private var mRegisterAvailability: Map<String, RegisterAvailabilityStatus>? = null
+    var registerAvailability: Map<String, RegisterAvailabilityStatus>
+        get() { mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> gson.fromJson<Map<String, RegisterAvailabilityStatus>>(it, object: TypeToken<Map<String, RegisterAvailabilityStatus>>(){}.type) }; return mRegisterAvailability ?: mapOf() }
+        set(value) { config.setMap("registerAvailability", value); mRegisterAvailability = value }
 }

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

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

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

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

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

@@ -90,35 +90,39 @@ const val IDZIENNIK_API_MESSAGES_SENT = "Wiadomosci/Wyslane"
 
 val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT
 
-const val VULCAN_API_USER_AGENT = "MobileUserAgent"
+const val VULCAN_HEBE_USER_AGENT = "Dart/2.10 (dart:io)"
-const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia"
+const val VULCAN_HEBE_APP_NAME = "DzienniczekPlus 2.0"
-const val VULCAN_API_APP_VERSION = "20.5.1.470"
+const val VULCAN_HEBE_APP_VERSION = "21.02.09 (G)"
-const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06"
+private const val VULCAN_API_DEVICE_NAME_PREFIX = "Szkolny.eu "
-const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB"
+private const val VULCAN_API_DEVICE_NAME_SUFFIX = " - nie usuwać"
-val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}"
+val VULCAN_API_DEVICE_NAME by lazy {
+    val base = "$VULCAN_API_DEVICE_NAME_PREFIX${Build.MODEL}"
+    val baseMaxLength = 50 - VULCAN_API_DEVICE_NAME_SUFFIX.length
+    base.take(baseMaxLength) + VULCAN_API_DEVICE_NAME_SUFFIX
+}
 
-const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat"
-const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow"
-const val VULCAN_API_ENDPOINT_DICTIONARIES = "mobile-api/Uczen.v3.Uczen/Slowniki"
-const val VULCAN_API_ENDPOINT_TIMETABLE = "mobile-api/Uczen.v3.Uczen/PlanLekcjiZeZmianami"
-const val VULCAN_API_ENDPOINT_GRADES = "mobile-api/Uczen.v3.Uczen/Oceny"
-const val VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS = "mobile-api/Uczen.v3.Uczen/OcenyPodsumowanie"
-const val VULCAN_API_ENDPOINT_EVENTS = "mobile-api/Uczen.v3.Uczen/Sprawdziany"
-const val VULCAN_API_ENDPOINT_HOMEWORK = "mobile-api/Uczen.v3.Uczen/ZadaniaDomowe"
-const val VULCAN_API_ENDPOINT_NOTICES = "mobile-api/Uczen.v3.Uczen/UwagiUcznia"
-const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje"
-const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane"
-const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane"
-const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci"
-const val VULCAN_API_ENDPOINT_MESSAGES_ADD = "mobile-api/Uczen.v3.Uczen/DodajWiadomosc"
-const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken"
-const val VULCAN_API_ENDPOINT_MESSAGES_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/WiadomosciZalacznik"
-const val VULCAN_API_ENDPOINT_HOMEWORK_ATTACHMENTS = "mobile-api/Uczen.v3.Uczen/ZadaniaDomoweZalacznik"
 const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers"
 const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get"
+const val VULCAN_HEBE_ENDPOINT_REGISTER_NEW = "api/mobile/register/new"
+const val VULCAN_HEBE_ENDPOINT_MAIN = "api/mobile/register/hebe"
+const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule"
+const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes"
+const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook"
+const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam"
+const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade"
+const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary"
+const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework"
+const val VULCAN_HEBE_ENDPOINT_NOTICES = "api/mobile/note"
+const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status"
+const val VULCAN_HEBE_ENDPOINT_MESSAGES_SEND = "api/mobile/message"
+const val VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER = "api/mobile/school/lucky"
 
 const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}"
 
-const val PODLASIE_API_VERSION = "1.0.31"
+const val PODLASIE_API_VERSION = "1.0.62"
 const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api"
 const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia"
+const val PODLASIE_API_LOGOUT_DEVICES_ENDPOINT = "/wyczyscUrzadzenia"

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

@@ -148,17 +148,11 @@ const val ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM             = 218
 
 const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL                 = 301
 const val ERROR_LOGIN_VULCAN_INVALID_TOKEN                  = 302
-const val ERROR_LOGIN_VULCAN_INVALID_PIN                    = 309
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING        = 310
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING        = 311
 const val ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING        = 312
 const val ERROR_LOGIN_VULCAN_EXPIRED_TOKEN                  = 321
-const val ERROR_LOGIN_VULCAN_OTHER                          = 322
-const val ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN              = 330
 const val ERROR_LOGIN_VULCAN_NO_PUPILS                      = 331
-const val ERROR_VULCAN_API_MAINTENANCE                      = 340
-const val ERROR_VULCAN_API_BAD_REQUEST                      = 341
-const val ERROR_VULCAN_API_OTHER                            = 342
 const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD                  = 343
 const val ERROR_VULCAN_WEB_DATA_MISSING                     = 344
 const val ERROR_VULCAN_WEB_429                              = 345
@@ -170,28 +164,14 @@ const val ERROR_VULCAN_WEB_LOGGED_OUT                       = 350
 const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED          = 351
 const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT                 = 352
 const val ERROR_VULCAN_WEB_NO_SCHOOLS                       = 353
-
+const val ERROR_VULCAN_HEBE_OTHER                           = 354
-const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN           = 401
+const val ERROR_VULCAN_HEBE_SIGNATURE_ERROR                 = 360
-const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME     = 402
+const val ERROR_VULCAN_HEBE_INVALID_PAYLOAD                 = 361
-const val ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED  = 403
+const val ERROR_VULCAN_HEBE_FIREBASE_ERROR                  = 362
-const val ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE             = 404
+const val ERROR_VULCAN_HEBE_CERTIFICATE_GONE                = 363
-const val ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR            = 405
+const val ERROR_VULCAN_HEBE_SERVER_ERROR                    = 364
-const val ERROR_LOGIN_IDZIENNIK_WEB_OTHER                   = 410
+const val ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND                = 365
-const val ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS           = 411 /* {"d":{"__type":"mds.Web.mod_komunikator.WS_mod_wiadomosci+detailWiadomosci","Wiadomosc":{"_recordId":0,"DataNadania":null,"DataOdczytania":null,"Nadawca":null,"ListaOdbiorcow":[],"Tytul":null,"Text":null,"ListaZal":[]},"Bledy":{"__type":"mds.Module.Globalne+sBledy","CzyJestBlad":true,"ListaBledow":["Nie masz dostępu do tych zasobów!"],"ListaKodowBledow":[]},"czyJestWiecej":false}} */
+const val ERROR_VULCAN_API_DEPRECATED                       = 390
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION              = 420
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH                 = 421
-const val ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER               = 422
-const val ERROR_IDZIENNIK_WEB_ACCESS_DENIED                 = 430
-const val ERROR_IDZIENNIK_WEB_OTHER                         = 431
-const val ERROR_IDZIENNIK_WEB_MAINTENANCE                   = 432
-const val ERROR_IDZIENNIK_WEB_SERVER_ERROR                  = 433
-const val ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED        = 434
-const val ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR        = 440
-const val ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA               = 441
-const val ERROR_IDZIENNIK_API_ACCESS_DENIED                 = 450
-const val ERROR_IDZIENNIK_API_OTHER                         = 451
-const val ERROR_IDZIENNIK_API_NO_REGISTER                   = 452
-const val ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION  = 453
 
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN         = 501
 const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER                 = 510
@@ -215,19 +195,16 @@ const val EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN            = 903
 const val EXCEPTION_LIBRUS_API_REQUEST                      = 904
 const val EXCEPTION_LIBRUS_SYNERGIA_REQUEST                 = 905
 const val EXCEPTION_MOBIDZIENNIK_WEB_REQUEST                = 906
-const val EXCEPTION_VULCAN_API_REQUEST                      = 907
 const val EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST           = 908
 const val EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST            = 909
 const val EXCEPTION_NOTIFY                                  = 910
 const val EXCEPTION_LIBRUS_MESSAGES_REQUEST                 = 911
-const val EXCEPTION_IDZIENNIK_WEB_REQUEST                   = 912
-const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
-const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
 const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST                 = 920
 const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST                = 921
 const val ERROR_ONEDRIVE_DOWNLOAD                           = 930
 const val EXCEPTION_VULCAN_WEB_LOGIN                        = 931
 const val EXCEPTION_VULCAN_WEB_REQUEST                      = 932
 const val EXCEPTION_PODLASIE_API_REQUEST                    = 940
+const val EXCEPTION_VULCAN_HEBE_REQUEST                     = 950
 
 const val LOGIN_NO_ARGUMENTS                                = 1201

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

@@ -5,8 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api
 
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginApi
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginMessages
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal
@@ -16,13 +14,13 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.Mobidzie
 import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain
 import pl.szczodrzynski.edziennik.data.api.models.LoginMethod
 
 // librus
 // mobidziennik
-// idziennik
+// idziennik [*]
 // vulcan
 // mobireg
 
@@ -34,14 +32,10 @@ const val LOGIN_TYPE_IDZIENNIK = 3
 const val LOGIN_TYPE_TEMPLATE = 21
 
 // LOGIN MODES
-const val LOGIN_MODE_IDZIENNIK_WEB = 0
-
 const val LOGIN_MODE_TEMPLATE_WEB = 0
 
 // LOGIN METHODS
 const val LOGIN_METHOD_NOT_NEEDED = -1
-const val LOGIN_METHOD_IDZIENNIK_WEB = 100
-const val LOGIN_METHOD_IDZIENNIK_API = 200
 const val LOGIN_METHOD_TEMPLATE_WEB = 100
 const val LOGIN_METHOD_TEMPLATE_API = 200
 
@@ -98,11 +92,12 @@ val mobidziennikLoginMethods = listOf(
 const val LOGIN_TYPE_VULCAN = 4
 const val LOGIN_MODE_VULCAN_API = 0
 const val LOGIN_MODE_VULCAN_WEB = 1
+const val LOGIN_MODE_VULCAN_HEBE = 2
 const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100
 const val LOGIN_METHOD_VULCAN_WEB_NEW = 200
 const val LOGIN_METHOD_VULCAN_WEB_OLD = 300
 const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400
-const val LOGIN_METHOD_VULCAN_API = 500
+const val LOGIN_METHOD_VULCAN_HEBE = 600
 val vulcanLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java)
                 .withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") }
@@ -116,21 +111,11 @@ val vulcanLoginMethods = listOf(
                 .withIsPossible { _, _ -> false }
                 .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/
 
-        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java)
+        LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_HEBE, VulcanLoginHebe::class.java)
-                .withIsPossible { _, _ -> true }
+                .withIsPossible { _, loginStore ->
-                .withRequiredLoginMethod { _, loginStore ->
+                        loginStore.mode != LOGIN_MODE_VULCAN_API
-                    if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_MAIN else LOGIN_METHOD_NOT_NEEDED
                 }
-)
+                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }
-
-val idziennikLoginMethods = listOf(
-        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_WEB, IdziennikLoginWeb::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED },
-
-        LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_API, IdziennikLoginApi::class.java)
-                .withIsPossible { _, _ -> true }
-                .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_IDZIENNIK_WEB }
 )
 
 const val LOGIN_TYPE_EDUDZIENNIK = 5

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

@@ -12,6 +12,10 @@ object Regexes {
         """color: (\w+);?""".toRegex()
     }
 
+    val NOT_DIGITS by lazy {
+        """[^0-9]""".toRegex()
+    }
+
 
 
     val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy {
@@ -80,6 +84,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)
     }
@@ -143,7 +156,7 @@ object Regexes {
         """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
     }
     val VULCAN_WEB_PERMISSIONS by lazy {
-        """permissions: '([A-z0-9/=+\-_]+?)'""".toRegex()
+        """permissions: '([A-z0-9/=+\-_|]+?)'""".toRegex()
     }
     val VULCAN_WEB_SYMBOL_VALIDATE by lazy {
         """[A-z0-9]+""".toRegex(IGNORE_CASE)

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

@@ -5,19 +5,20 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik
 
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
+import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.R
+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
@@ -88,13 +89,39 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
                 taskCallback.onCompleted()
                 return
             }
+
+            profile.registerName?.let { registerName ->
+                var status = app.config.sync.registerAvailability[registerName]
+                if (status == null || status.nextCheckAt < currentTimeUnix()) {
+                    val api = SzkolnyApi(app)
+                    api.runCatching({
+                        val availability = getRegisterAvailability()
+                        app.config.sync.registerAvailability = availability
+                        status = availability[registerName]
+                    }, onError = {
+                        taskCallback.onError(it.toApiError(TAG))
+                        return
+                    })
+                }
+
+                if (status?.available != true
+                        || status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
+                    if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
+                        EventBus.getDefault().postSticky(
+                                RegisterAvailabilityEvent(app.config.sync.registerAvailability)
+                        )
+                    }
+                    cancel()
+                    taskCallback.onCompleted()
+                    return
+                }
+            }
         }
 
         edziennikInterface = when (loginStore.type) {
             LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback)
-            LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback)
             LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback)

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

@@ -1,175 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
-import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-
-class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
-
-    fun isWebLoginValid() = loginExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty() && webAuth.isNotNullNorEmpty()
-    fun isApiLoginValid() = apiExpiryTime-30 > currentTimeUnix() && apiBearer.isNotNullNorEmpty()
-
-    override fun satisfyLoginMethods() {
-        loginMethods.clear()
-        if (isWebLoginValid()) {
-            loginMethods += LOGIN_METHOD_IDZIENNIK_WEB
-            app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", webSessionId)
-            app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", webAuth)
-        }
-        if (isApiLoginValid())
-            loginMethods += LOGIN_METHOD_IDZIENNIK_API
-    }
-
-    override fun generateUserCode() = "$webSchoolName:$webUsername:$registerId"
-
-    private var mLoginExpiryTime: Long? = null
-    var loginExpiryTime: Long
-        get() { mLoginExpiryTime = mLoginExpiryTime ?: loginStore.getLoginData("loginExpiryTime", 0L); return mLoginExpiryTime ?: 0L }
-        set(value) { loginStore.putLoginData("loginExpiryTime", value); mLoginExpiryTime = value }
-
-    private var mApiExpiryTime: Long? = null
-    var apiExpiryTime: Long
-        get() { mApiExpiryTime = mApiExpiryTime ?: loginStore.getLoginData("apiExpiryTime", 0L); return mApiExpiryTime ?: 0L }
-        set(value) { loginStore.putLoginData("apiExpiryTime", value); mApiExpiryTime = value }
-
-    /*   __          __  _
-         \ \        / / | |
-          \ \  /\  / /__| |__
-           \ \/  \/ / _ \ '_ \
-            \  /\  /  __/ |_) |
-             \/  \/ \___|_._*/
-    private var mWebSchoolName: String? = null
-    var webSchoolName: String?
-        get() { mWebSchoolName = mWebSchoolName ?: loginStore.getLoginData("schoolName", null); return mWebSchoolName }
-        set(value) { loginStore.putLoginData("schoolName", value); mWebSchoolName = value }
-    private var mWebUsername: String? = null
-    var webUsername: String?
-        get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("username", null); return mWebUsername }
-        set(value) { loginStore.putLoginData("username", value); mWebUsername = value }
-    private var mWebPassword: String? = null
-    var webPassword: String?
-        get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("password", null); return mWebPassword }
-        set(value) { loginStore.putLoginData("password", value); mWebPassword = value }
-
-    private var mWebSessionId: String? = null
-    var webSessionId: String?
-        get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId }
-        set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value }
-    private var mWebAuth: String? = null
-    var webAuth: String?
-        get() { mWebAuth = mWebAuth ?: loginStore.getLoginData("webAuth", null); return mWebAuth }
-        set(value) { loginStore.putLoginData("webAuth", value); mWebAuth = value }
-
-    private var mWebSelectedRegister: Int? = null
-    var webSelectedRegister: Int
-        get() { mWebSelectedRegister = mWebSelectedRegister ?: loginStore.getLoginData("webSelectedRegister", 0); return mWebSelectedRegister ?: 0 }
-        set(value) { loginStore.putLoginData("webSelectedRegister", value); mWebSelectedRegister = value }
-
-    /*                   _
-             /\         (_)
-            /  \   _ __  _
-           / /\ \ | '_ \| |
-          / ____ \| |_) | |
-         /_/    \_\ .__/|_|
-                  | |
-                  |*/
-    private var mApiBearer: String? = null
-    var apiBearer: String?
-        get() { mApiBearer = mApiBearer ?: loginStore.getLoginData("apiBearer", null); return mApiBearer }
-        set(value) { loginStore.putLoginData("apiBearer", value); mApiBearer = 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 mRegisterId: Int? = null
-    var registerId: Int
-        get() { mRegisterId = mRegisterId ?: profile?.getStudentData("registerId", 0); return mRegisterId ?: 0 }
-        set(value) { profile?.putStudentData("registerId", value) ?: return; mRegisterId = value }
-
-    private var mSchoolYearId: Int? = null
-    var schoolYearId: Int
-        get() { mSchoolYearId = mSchoolYearId ?: profile?.getStudentData("schoolYearId", 0); return mSchoolYearId ?: 0 }
-        set(value) { profile?.putStudentData("schoolYearId", value) ?: return; mSchoolYearId = value }
-
-
-
-    /*    _    _ _   _ _
-         | |  | | | (_) |
-         | |  | | |_ _| |___
-         | |  | | __| | / __|
-         | |__| | |_| | \__ \
-          \____/ \__|_|_|__*/
-    fun getSubject(name: String, id: Long?, shortName: String): Subject {
-        var subject = if (id == null)
-            subjectList.singleOrNull { it.longName == name }
-        else
-            subjectList.singleOrNull { it.id == id }
-
-        if (subject == null) {
-            subject = Subject(profileId, id
-                    ?: name.crc16().toLong(), name, shortName)
-            subjectList[subject.id] = subject
-        }
-        return subject
-    }
-
-    fun getTeacher(firstName: String, lastName: String): Teacher {
-        val teacher = teacherList.singleOrNull { it.fullName == "$firstName $lastName" }
-        return validateTeacher(teacher, firstName, lastName)
-    }
-
-    fun getTeacher(firstNameChar: Char, lastName: String): Teacher {
-        val teacher = teacherList.singleOrNull { it.shortName == "$firstNameChar.$lastName" }
-        return validateTeacher(teacher, firstNameChar.toString(), lastName)
-    }
-
-    fun getTeacherByLastFirst(nameLastFirst: String): Teacher {
-        val nameParts = nameLastFirst.split(" ")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[1], nameParts[0])
-    }
-
-    fun getTeacherByFirstLast(nameFirstLast: String): Teacher {
-        val nameParts = nameFirstLast.split(" ")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0], nameParts[1])
-    }
-
-    fun getTeacherByFDotLast(nameFDotLast: String): Teacher {
-        val nameParts = nameFDotLast.split(".")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
-    }
-
-    fun getTeacherByFDotSpaceLast(nameFDotSpaceLast: String): Teacher {
-        val nameParts = nameFDotSpaceLast.split(".")
-        return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1])
-    }
-
-    private fun validateTeacher(teacher: Teacher?, firstName: String, lastName: String): Teacher {
-        (teacher ?: Teacher(profileId, -1, firstName, lastName).apply {
-            id = shortName.crc16().toLong()
-            teacherList[id] = this
-        }).apply {
-            if (firstName.length > 1)
-                name = firstName
-            surname = lastName
-            return this
-        }
-    }
-}

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

@@ -1,169 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikData
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin.IdziennikFirstLogin
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.*
-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
-
-class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
-    companion object {
-        private const val TAG = "Idziennik"
-    }
-
-    val internalErrorList = mutableListOf<Int>()
-    val data: DataIdziennik
-    private var afterLogin: (() -> Unit)? = null
-
-    init {
-        data = DataIdziennik(app, profile, loginStore).apply {
-            callback = wrapCallback(this@Idziennik.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(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId, onlyEndpoints)
-        login()
-    }
-
-    private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
-        d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        loginMethodId?.let { data.prepareFor(idziennikLoginMethods, it) }
-        afterLogin?.let { this.afterLogin = it }
-        IdziennikLogin(data) {
-            data()
-        }
-    }
-
-    private fun data() {
-        d(TAG, "Endpoint IDs: ${data.targetEndpointIds}")
-        if (internalErrorList.isNotEmpty()) {
-            d(TAG, "  - Internal errors:")
-            internalErrorList.forEach { d(TAG, "      - code $it") }
-        }
-        afterLogin?.invoke() ?: IdziennikData(data) {
-            completed()
-        }
-    }
-
-    override fun getMessage(message: MessageFull) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetMessage(data, message) {
-                completed()
-            }
-        }
-    }
-
-    override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
-        login(LOGIN_METHOD_IDZIENNIK_API) {
-            IdziennikWebSendMessage(data, recipients, subject, text) {
-                completed()
-            }
-        }
-    }
-
-    override fun markAllAnnouncementsAsRead() {}
-    override fun getAnnouncement(announcement: AnnouncementFull) {}
-
-    override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            if (owner is Message) {
-                IdziennikWebGetAttachment(data, owner, attachmentId, attachmentName) {
-                    completed()
-                }
-            }
-            else if (owner is Event) {
-                IdziennikWebGetHomeworkAttachment(data, owner, attachmentId, attachmentName) {
-                    completed()
-                }
-            }
-        }
-    }
-
-    override fun getRecipientList() {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetRecipientList(data) {
-                completed()
-            }
-        }
-    }
-
-    override fun getEvent(eventFull: EventFull) {
-        login(LOGIN_METHOD_IDZIENNIK_WEB) {
-            IdziennikWebGetHomework(data, eventFull) {
-                completed()
-            }
-        }
-    }
-
-    override fun firstLogin() { IdziennikFirstLogin(data) { completed() } }
-    override fun cancel() {
-        d(TAG, "Cancelled")
-        data.cancel()
-    }
-
-    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) {
-                if (apiError.errorCode in internalErrorList) {
-                    // finish immediately if the same error occurs twice during the same sync
-                    callback.onError(apiError)
-                    return
-                }
-                internalErrorList.add(apiError.errorCode)
-                when (apiError.errorCode) {
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION,
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH,
-                    ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER,
-                    ERROR_IDZIENNIK_WEB_ACCESS_DENIED,
-                    ERROR_IDZIENNIK_API_ACCESS_DENIED -> {
-                        data.loginMethods.remove(LOGIN_METHOD_IDZIENNIK_WEB)
-                        data.prepareFor(idziennikLoginMethods, LOGIN_METHOD_IDZIENNIK_WEB)
-                        data.loginExpiryTime = 0
-                        login()
-                    }
-                    ERROR_IDZIENNIK_API_NO_REGISTER -> {
-                        data()
-                    }
-                    else -> callback.onError(apiError)
-                }
-            }
-        }
-    }
-}

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

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
-
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.models.Feature
-
-const val ENDPOINT_IDZIENNIK_WEB_TIMETABLE              = 1030
-const val ENDPOINT_IDZIENNIK_WEB_GRADES                 = 1040
-const val ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES        = 1050
-const val ENDPOINT_IDZIENNIK_WEB_EXAMS                  = 1060
-const val ENDPOINT_IDZIENNIK_WEB_HOMEWORK               = 1061
-const val ENDPOINT_IDZIENNIK_WEB_NOTICES                = 1070
-const val ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS          = 1080
-const val ENDPOINT_IDZIENNIK_WEB_ATTENDANCE             = 1090
-const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX         = 1110
-const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT          = 1120
-const val ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER       = 2010
-const val ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX         = 2110
-const val ENDPOINT_IDZIENNIK_API_MESSAGES_SENT          = 2120
-
-val IdziennikFeatures = listOf(
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_TIMETABLE, listOf(
-                ENDPOINT_IDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_GRADES, listOf(
-                ENDPOINT_IDZIENNIK_WEB_GRADES to LOGIN_METHOD_IDZIENNIK_WEB,
-                ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_AGENDA, listOf(
-                ENDPOINT_IDZIENNIK_WEB_EXAMS to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_HOMEWORK, listOf(
-                ENDPOINT_IDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_BEHAVIOUR, listOf(
-                ENDPOINT_IDZIENNIK_WEB_NOTICES to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ATTENDANCE, listOf(
-                ENDPOINT_IDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf(
-                ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)),
-
-        /*Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_WEB
-        ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),*/
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_IDZIENNIK_API_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API)),
-
-        Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_LUCKY_NUMBER, listOf(
-                ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER to LOGIN_METHOD_IDZIENNIK_API
-        ), listOf(LOGIN_METHOD_IDZIENNIK_API))
-)

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

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-29.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-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.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.net.HttpURLConnection
-
-open class IdziennikApi(open val data: DataIdziennik, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "IdziennikApi"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun apiGet(tag: String, endpointTemplate: String, method: Int = GET, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonElement) -> Unit) {
-        val endpoint = endpointTemplate.replace("\$STUDENT_ID", data.studentId ?: "")
-        Utils.d(tag, "Request: Idziennik/API - $IDZIENNIK_API_URL/$endpoint")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                val json = try {
-                    JsonParser().parse(text)
-                } catch (_: Exception) { null }
-
-                var error: String? = null
-                if (json == null) {
-                    error = text
-                }
-                else if (json is JsonObject) {
-                    error = if (response?.code() == 200) null else
-                        json.getString("message") ?: json.toString()
-                }
-                error?.let { code ->
-                    when (code) {
-                        "Uczeń nie posiada aktywnej pozycji w dzienniku" -> ERROR_IDZIENNIK_API_NO_REGISTER
-                        "Authorization has been denied for this request." -> ERROR_IDZIENNIK_API_ACCESS_DENIED
-                        else -> ERROR_IDZIENNIK_API_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(tag, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                try {
-                    onSuccess(json!!)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_API_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("$IDZIENNIK_API_URL/$endpoint")
-                .userAgent(IDZIENNIK_API_USER_AGENT)
-                .addHeader("Authorization", "Bearer ${data.apiBearer}")
-                .apply {
-                    when (method) {
-                        GET -> get()
-                        POST -> {
-                            postJson()
-                            val json = JsonObject()
-                            parameters.map { (name, value) ->
-                                when (value) {
-                                    is JsonObject -> json.add(name, value)
-                                    is JsonArray -> json.add(name, value)
-                                    is String -> json.addProperty(name, value)
-                                    is Int -> json.addProperty(name, value)
-                                    is Long -> json.addProperty(name, value)
-                                    is Float -> json.addProperty(name, value)
-                                    is Char -> json.addProperty(name, value)
-                                }
-                            }
-                            setJsonBody(json)
-                        }
-                    }
-                }
-                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
-                .allowErrorCode(HttpURLConnection.HTTP_INTERNAL_ERROR)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}

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

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiCurrentRegister
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesInbox
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.*
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikData"
-    }
-
-    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) { endpointId ->
-            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_IDZIENNIK_WEB_TIMETABLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                IdziennikWebTimetable(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                IdziennikWebGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                IdziennikWebProposedGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_EXAMS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_exams)
-                IdziennikWebExams(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                IdziennikWebHomework(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                IdziennikWebNotices(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_announcements)
-                IdziennikWebAnnouncements(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                IdziennikWebAttendance(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
-                IdziennikApiCurrentRegister(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                IdziennikApiMessagesInbox(data, lastSync, onSuccess)
-            }
-            ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
-                IdziennikApiMessagesSent(data, lastSync, onSuccess)
-            }
-            else -> onSuccess(endpointId)
-        }
-    }
-}

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

@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.FileCallbackHandler
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.IdziennikWebSwitchRegister
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.io.File
-import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR
-import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
-
-open class IdziennikWeb(open val data: DataIdziennik, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "IdziennikWeb"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun webApiGet(tag: String, endpoint: String, parameters: Map<String, Any> = emptyMap(), onSuccess: (json: JsonObject) -> Unit) {
-        d(tag, "Request: Idziennik/Web/API - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null && response?.parserErrorBody == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (response?.code() == HTTP_INTERNAL_ERROR && endpoint == IDZIENNIK_WEB_GET_RECIPIENT_LIST) {
-                    data.error(ApiError(tag, ERROR_IDZIENNIK_WEB_RECIPIENT_LIST_NO_PERMISSION)
-                            .withResponse(response)
-                            .withApiResponse(json))
-                    return
-                }
-
-                if (response?.code() == HTTP_INTERNAL_ERROR && endpoint == IDZIENNIK_WEB_GRADES) {
-                    // special override for accounts where displaying grades
-                    // for another student requires switching it manually
-                    if (data.registerId != data.webSelectedRegister) {
-                        IdziennikWebSwitchRegister(data, data.registerId) {
-                            webApiGet(tag, endpoint, parameters, onSuccess)
-                        }
-                        return
-                    }
-                }
-
-                when {
-                    response?.code() == HTTP_UNAUTHORIZED -> ERROR_IDZIENNIK_WEB_ACCESS_DENIED
-                    response?.code() == HTTP_INTERNAL_ERROR -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                    response?.parserErrorBody != null -> when {
-                        response.parserErrorBody.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                        response.parserErrorBody.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                        response.parserErrorBody.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
-                        else -> ERROR_IDZIENNIK_WEB_OTHER
-                    }
-                    else -> null
-                }?.let { errorCode ->
-                    data.error(ApiError(TAG, errorCode)
-                            .withApiResponse(json?.toString() ?: response?.parserErrorBody)
-                            .withResponse(response))
-                    return
-                }
-
-                if (json == null) {
-                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(json)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_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("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .postJson()
-                .apply {
-                    val json = JsonObject()
-                    parameters.map { (name, value) ->
-                        when (value) {
-                            is JsonObject -> json.add(name, value)
-                            is JsonArray -> json.add(name, value)
-                            is String -> json.addProperty(name, value)
-                            is Int -> json.addProperty(name, value)
-                            is Long -> json.addProperty(name, value)
-                            is Float -> json.addProperty(name, value)
-                            is Char -> json.addProperty(name, value)
-                            is Boolean -> json.addProperty(name, value)
-                        }
-                    }
-                    setJsonBody(json)
-                }
-                .allowErrorCode(HTTP_UNAUTHORIZED)
-                .allowErrorCode(HTTP_INTERNAL_ERROR)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-
-    fun webGet(tag: String, endpoint: String, parameters: Map<String, Any> = emptyMap(), onSuccess: (text: String) -> Unit) {
-        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (!text.contains("czyWyswietlicDostepMobilny")) {
-                    when {
-                        text.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR
-                        text.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                        text.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE
-                        else -> ERROR_IDZIENNIK_WEB_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                try {
-                    onSuccess(text)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_IDZIENNIK_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("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .apply {
-                    if (parameters.isEmpty()) get()
-                    else post()
-
-                    parameters.map { (name, value) ->
-                        addParameter(name, value)
-                    }
-                }
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-
-    fun webGetFile(tag: String, endpoint: String, targetFile: File, parameters: Map<String, Any>,
-                   onSuccess: (file: File) -> Unit, onProgress: (written: Long, total: Long) -> Unit) {
-
-        d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint")
-
-        val callback = object : FileCallbackHandler(targetFile) {
-            override fun onSuccess(file: File?, response: Response?) {
-                if (file == null) {
-                    data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(file)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
-                            .withResponse(response)
-                            .withThrowable(e))
-                }
-            }
-
-            override fun onProgress(bytesWritten: Long, bytesTotal: Long) {
-                try {
-                    onProgress(bytesWritten, bytesTotal)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_FILE_REQUEST)
-                            .withThrowable(e))
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(tag, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$endpoint")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .apply {
-                    parameters.forEach { (k, v) -> addParameter(k, v) }
-                }
-                .contentType("application/x-www-form-urlencoded")
-                .post()
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}

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

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-29.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_CURRENT_REGISTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class IdziennikApiCurrentRegister(override val data: DataIdziennik,
-                                  override val lastSync: Long?,
-                                  val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiCurrentRegister"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_CURRENT_REGISTER) { json ->
-            if (json !is JsonObject) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER)
-                return@apiGet
-            }
-
-            var nextSync = System.currentTimeMillis() + 14*DAY*1000
-
-            val settings = json.getJsonObject("ustawienia")?.apply {
-                getString("poczatekSemestru1")?.let { profile?.dateSemester1Start = Date.fromY_m_d(it) }
-                getString("koniecSemestru1")?.let { profile?.dateSemester2Start = Date.fromY_m_d(it).stepForward(0, 0, 1) }
-                getString("koniecSemestru2")?.let { profile?.dateYearEnd = Date.fromY_m_d(it) }
-            }
-
-            json.getInt("szczesliwyNumerek")?.let { luckyNumber ->
-                val luckyNumberDate = Date.getToday()
-                settings.getString("godzinaPublikacjiSzczesliwegoLosu")
-                        ?.let { Time.fromH_m(it) }
-                        ?.let { publishTime ->
-                            val now = Time.getNow()
-                            if (publishTime.value < 150000 && now.value < publishTime.value) {
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                                luckyNumberDate.stepForward(0, 0, -1) // the lucky number is still for yesterday
-                            }
-                            else if (publishTime.value >= 150000 && now.value > publishTime.value) {
-                                luckyNumberDate.stepForward(0, 0, 1) // the lucky number is already for tomorrow
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                            }
-                            else if (publishTime.value < 150000) {
-                                nextSync = luckyNumberDate
-                                        .clone()
-                                        .stepForward(0, 0, 1)
-                                        .combineWith(publishTime)
-                            }
-                            else {
-                                nextSync = luckyNumberDate.combineWith(publishTime)
-                            }
-                        }
-
-
-                val luckyNumberObject = LuckyNumber(
-                        profileId = data.profileId,
-                        date = luckyNumberDate,
-                        number = luckyNumber
-                )
-
-                data.luckyNumberList.add(luckyNumberObject)
-                data.metadataList.add(
-                        Metadata(
-                                profileId,
-                                Metadata.TYPE_LUCKY_NUMBER,
-                                luckyNumberObject.date.value.toLong(),
-                                true,
-                                data.profile?.empty ?: false
-                        ))
-            }
-
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER, syncAt = nextSync)
-            onSuccess(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER)
-        }
-    }
-}

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

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.getBoolean
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.Utils.crc32
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikApiMessagesInbox(override val data: DataIdziennik,
-                                override val lastSync: Long?,
-                                val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiMessagesInbox"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_MESSAGES_INBOX) { json ->
-            if (json !is JsonArray) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX)
-                return@apiGet
-            }
-
-            json.asJsonObjectList().forEach { jMessage ->
-                val subject = jMessage.getString("tytul") ?: ""
-                if (subject.contains("(") && subject.startsWith("iDziennik - "))
-                    return@forEach
-                if (subject.startsWith("Uwaga dla ucznia (klasa:"))
-                    return@forEach
-
-                val messageIdStr = jMessage.getString("id")
-                val messageId = crc32((messageIdStr + "0").toByteArray())
-
-                var body = "[META:$messageIdStr;-1]"
-                body += jMessage.getString("tresc")?.replace("\n".toRegex(), "<br>")
-
-                val readDate = if (jMessage.getBoolean("odczytana") == true) Date.fromIso(jMessage.getString("wersjaRekordu")) else 0
-                val sentDate = Date.fromIso(jMessage.getString("dataWyslania"))
-
-                val sender = jMessage.getAsJsonObject("nadawca")
-                var firstName = sender.getString("imie")
-                var lastName = sender.getString("nazwisko")
-                if (firstName.isNullOrEmpty() || lastName.isNullOrEmpty()) {
-                    firstName = "usunięty"
-                    lastName = "użytkownik"
-                }
-                val rTeacher = data.getTeacher(
-                        firstName,
-                        lastName
-                )
-                rTeacher.loginId = /*sender.getString("id") + ":" + */sender.getString("usr")
-                rTeacher.setTeacherType(Teacher.TYPE_OTHER)
-
-                val message = Message(
-                        profileId = profileId,
-                        id = messageId,
-                        type = if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED,
-                        subject = subject,
-                        body = body,
-                        senderId = rTeacher.id,
-                        addedDate = sentDate
-                )
-
-                val messageRecipient = MessageRecipient(
-                        profileId,
-                        -1 /* me */,
-                        -1,
-                        readDate,
-                        /*messageId*/ messageId
-                )
-
-                data.messageList.add(message)
-                data.messageRecipientList.add(messageRecipient)
-                data.setSeenMetadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_MESSAGE,
-                        message.id,
-                        readDate > 0,
-                        readDate > 0 || profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX)
-        }
-    }
-}

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

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-30.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.DAY
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.utils.Utils.crc32
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikApiMessagesSent(override val data: DataIdziennik,
-                               override val lastSync: Long?,
-                               val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikApi(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikApiMessagesSent"
-    }
-
-    init {
-        apiGet(TAG, IDZIENNIK_API_MESSAGES_SENT) { json ->
-            if (json !is JsonArray) {
-                onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
-                return@apiGet
-            }
-
-            json.asJsonObjectList()?.forEach { jMessage ->
-                val messageIdStr = jMessage.get("id").asString
-                val messageId = crc32((messageIdStr + "1").toByteArray())
-
-                val subject = jMessage.get("tytul").asString
-
-                var body = "[META:$messageIdStr;-1]"
-                body += jMessage.get("tresc").asString.replace("\n".toRegex(), "<br>")
-
-                val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString)
-
-                val message = Message(
-                        profileId = profileId,
-                        id = messageId,
-                        type = TYPE_SENT,
-                        subject = subject,
-                        body = body,
-                        senderId = null,
-                        addedDate = sentDate
-                )
-
-                for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) {
-                    val recipient = recipientEl.asJsonObject
-                    var firstName = recipient.get("imie").asString
-                    var lastName = recipient.get("nazwisko").asString
-                    if (firstName.isEmpty() || lastName.isEmpty()) {
-                        firstName = "usunięty"
-                        lastName = "użytkownik"
-                    }
-                    val rTeacher = data.getTeacher(firstName, lastName)
-                    rTeacher.loginId = /*recipient.get("id").asString + ":" + */recipient.get("usr").asString
-
-                    val messageRecipient = MessageRecipient(
-                            profileId,
-                            rTeacher.id,
-                            -1,
-                            -1,
-                            /*messageId*/ messageId
-                    )
-                    data.messageRecipientIgnoreList.add(messageRecipient)
-                }
-
-                data.messageList.add(message)
-                data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
-            onSuccess(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT)
-        }
-    }
-}

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

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Announcement
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebAnnouncements(override val data: DataIdziennik,
-                                override val lastSync: Long?,
-                                val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebAnnouncements"
-    }
-
-    init {
-        val param = JsonObject()
-        param.add("parametryFiltrow", JsonArray())
-
-        webApiGet(TAG, IDZIENNIK_WEB_ANNOUNCEMENTS, mapOf(
-                "uczenId" to (data.studentId ?: ""),
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jAnnouncementEl in json.getAsJsonArray("ListK")) {
-                val jAnnouncement = jAnnouncementEl.asJsonObject
-                // jAnnouncement
-                val announcementId = jAnnouncement.getLong("Id") ?: -1
-
-                val rTeacher = data.getTeacherByFirstLast(jAnnouncement.getString("Autor") ?: "")
-                val addedDate = jAnnouncement.getString("DataDodania")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull() ?: System.currentTimeMillis()
-                val startDate = jAnnouncement.getString("DataWydarzenia")?.replace("[^\\d]".toRegex(), "")?.toLongOrNull()?.let { Date.fromMillis(it) }
-
-                val announcementObject = Announcement(
-                        profileId = profileId,
-                        id = announcementId,
-                        subject = jAnnouncement.get("Temat").asString,
-                        text = jAnnouncement.get("Tresc").asString,
-                        startDate = startDate,
-                        endDate = null,
-                        teacherId = rTeacher.id,
-                        addedDate = addedDate
-                )
-                data.announcementList.add(announcementObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_ANNOUNCEMENT,
-                        announcementObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS)
-        }
-    }
-}

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

@@ -1,180 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_BELATED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT_CUSTOM
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_UNKNOWN
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class IdziennikWebAttendance(override val data: DataIdziennik,
-                             override val lastSync: Long?,
-                             val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebAttendance"
-    }
-
-    private var attendanceYear = Date.getToday().year
-    private var attendanceMonth = Date.getToday().month
-    private var attendancePrevMonthChecked = false
-
-    init {
-        getAttendance()
-    }
-
-    private fun getAttendance() {
-        webApiGet(TAG, IDZIENNIK_WEB_ATTENDANCE, mapOf(
-                "idPozDziennika" to data.registerId,
-                "mc" to attendanceMonth,
-                "rok" to attendanceYear,
-                "dataTygodnia" to ""
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) {
-                val jAttendance = jAttendanceEl.asJsonObject
-                // jAttendance
-                val type = jAttendance.get("TypObecnosci").asInt
-
-                // skip "zajęcia nie odbyły się" and "Ferie"
-                if (type == 5 || type == 7)
-                    continue
-
-                val date = Date.fromY_m_d(jAttendance.get("Data").asString)
-                val time = Time.fromH_m(jAttendance.get("OdDoGodziny").asString)
-                if (date.combineWith(time) > System.currentTimeMillis())
-                    continue
-
-                val id = jAttendance.get("IdLesson").asString.crc16().toLong()
-                val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "")
-                val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString)
-
-                var baseType = TYPE_UNKNOWN
-                var typeName = "nieznany rodzaj"
-                var typeSymbol: String? = null
-                var typeColor: Long? = null
-
-                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosciUcznia_lmt637231494660000000.js */
-                /* https://iuczniowie.progman.pl/idziennik/mod_panelRodzica/obecnosci/obecnosci_lmt637231494660000000.css */
-                when (type) {
-                    1 -> {
-                        baseType = TYPE_ABSENT_EXCUSED
-                        typeName = "nieobecność usprawiedliwiona"
-                        typeColor = 0xffffe099
-                    }
-                    2 -> {
-                        baseType = TYPE_BELATED
-                        typeName = "spóźnienie"
-                        typeColor = 0xffffffaa
-                    }
-                    3 -> {
-                        baseType = TYPE_ABSENT
-                        typeName = "nieobecność nieusprawiedliwiona"
-                        typeColor = 0xffffad99
-                    }
-                    4, 9 -> {
-                        baseType = TYPE_RELEASED
-                        if (type == 4) {
-                            typeName = "zwolnienie"
-                            typeColor = 0xffa8beff
-                        }
-                        if (type == 9) {
-                            typeName = "zwolniony / obecny"
-                            typeSymbol = "zb"
-                            typeColor = 0xffff69b4
-                        }
-                    }
-                    8 -> {
-                        baseType = TYPE_PRESENT_CUSTOM
-                        typeName = "wycieczka"
-                        typeSymbol = "w"
-                        typeColor = null
-                    }
-                    0 -> {
-                        baseType = TYPE_PRESENT
-                        typeName = "obecny"
-                        typeColor = 0xffccffcc
-                    }
-                }
-
-                val semester = profile?.dateToSemester(date) ?: 1
-
-                val attendanceObject = Attendance(
-                        profileId = profileId,
-                        id = id,
-                        baseType = baseType,
-                        typeName = typeName,
-                        typeShort = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
-                        typeSymbol = typeSymbol ?: data.app.attendanceManager.getTypeShort(baseType),
-                        typeColor = typeColor?.toInt(),
-                        date = date,
-                        startTime = time,
-                        semester = semester,
-                        teacherId = rTeacher.id,
-                        subjectId = rSubject.id
-                ).also {
-                    it.lessonTopic = jAttendance.getString("PrzedmiotTemat")
-                    it.lessonNumber = jAttendance.getInt("Godzina")
-                }
-
-                data.attendanceList.add(attendanceObject)
-                if (attendanceObject.baseType != TYPE_PRESENT) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_ATTENDANCE,
-                            attendanceObject.id,
-                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN,
-                            profile?.empty ?: false || baseType == TYPE_PRESENT_CUSTOM || baseType == TYPE_UNKNOWN
-                    ))
-                }
-            }
-
-            val attendanceDateValue = attendanceYear * 10000 + attendanceMonth * 100
-            if (profile?.empty == true && attendanceDateValue > profile?.getSemesterStart(1)?.value ?: 99999999) {
-                attendancePrevMonthChecked = true // do not need to check prev month later
-                attendanceMonth--
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12
-                    attendanceYear--
-                }
-                getAttendance()
-            } else if (!attendancePrevMonthChecked /* get also the previous month */) {
-                attendanceMonth--
-                if (attendanceMonth < 1) {
-                    attendanceMonth = 12
-                    attendanceYear--
-                }
-                attendancePrevMonthChecked = true
-                getAttendance()
-            } else {
-                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE)
-            }
-        }
-    }
-}

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

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-import java.util.*
-
-class IdziennikWebExams(override val data: DataIdziennik,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebExams"
-    }
-
-    private var examsYear = Date.getToday().year
-    private var examsMonth = Date.getToday().month
-    private var examsMonthsChecked = 0
-    private var examsNextMonthChecked = false // TO DO temporary // no more // idk
-
-    init {
-        getExams()
-    }
-
-    private fun getExams() {
-        val param = JsonObject().apply {
-            addProperty("strona", 1)
-            addProperty("iloscNaStrone", "99")
-            addProperty("iloscRekordow", -1)
-            addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu")
-            addProperty("kierunekSort", 0)
-            addProperty("maxIloscZaznaczonych", 0)
-            addProperty("panelFiltrow", 0)
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf(
-                "idP" to data.registerId,
-                "rok" to examsYear,
-                "miesiac" to examsMonth,
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { exam ->
-                val id = exam.getLong("_recordId") ?: return@forEach
-                val examDate = Date.fromY_m_d(exam.getString("data") ?: return@forEach)
-                val subjectName = exam.getString("przedmiot") ?: return@forEach
-                val subjectId = data.getSubject(subjectName, null, subjectName).id
-                val teacherName = exam.getString("wpisal") ?: return@forEach
-                val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val topic = exam.getString("zakres")?.trim() ?: ""
-
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, examDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
-
-                val eventType = when (exam.getString("rodzaj")?.toLowerCase(Locale.getDefault())) {
-                    "sprawdzian/praca klasowa",
-                    "sprawdzian",
-                    "praca klasowa" -> Event.TYPE_EXAM
-                    "kartkówka" -> Event.TYPE_SHORT_QUIZ
-                    else -> Event.TYPE_EXAM
-                }
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = examDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = eventType,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = data.teamClass?.id ?: -1
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_EVENT,
-                        eventObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) {
-                examsMonthsChecked++
-                examsMonth--
-                if (examsMonth < 1) {
-                    examsMonth = 12
-                    examsYear--
-                }
-                getExams()
-            } else if (!examsNextMonthChecked /* get also one month forward */) {
-                val showDate = Date.getToday().stepForward(0, 1, 0)
-                examsYear = showDate.year
-                examsMonth = showDate.month
-                examsNextMonthChecked = true
-                getExams()
-            } else {
-                data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
-
-                data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_IDZIENNIK_WEB_EXAMS)
-            }
-        }
-    }
-}

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

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-28
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GET_ATTACHMENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.utils.Utils
-import java.io.File
-
-class IdziennikWebGetAttachment(override val data: DataIdziennik,
-                                val owner: Any,
-                                val attachmentId: Long,
-                                val attachmentName: String,
-                                val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        const val TAG = "IdziennikWebGetAttachment"
-    }
-
-    init {
-        val message = owner as Message
-
-        val messageId = "\\[META:([A-z0-9]+);([0-9-]+)]".toRegex().find(message.body ?: "")?.get(2) ?: -1
-        val targetFile = File(Utils.getStorageDir(), attachmentName)
-
-        webGetFile(TAG, IDZIENNIK_WEB_GET_ATTACHMENT, targetFile, mapOf(
-                "id" to messageId,
-                "fileName" to attachmentName
-        ), { file ->
-            val event = AttachmentGetEvent(
-                    profileId,
-                    owner,
-                    attachmentId,
-                    AttachmentGetEvent.TYPE_FINISHED,
-                    file.absolutePath
-            )
-
-            val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}")
-            Utils.writeStringToFile(attachmentDataFile, event.fileName)
-
-            EventBus.getDefault().postSticky(event)
-
-            onSuccess()
-
-        }) { written, _ ->
-            val event = AttachmentGetEvent(
-                    profileId,
-                    owner,
-                    attachmentId,
-                    AttachmentGetEvent.TYPE_PROGRESS,
-                    bytesWritten = written
-            )
-
-            EventBus.getDefault().postSticky(event)
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,178 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import android.graphics.Color
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebGrades(override val data: DataIdziennik,
-                         override val lastSync: Long?,
-                         val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebGrades"
-    }
-
-    init { data.profile?.also { profile ->
-        webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.onEach { subjectJson ->
-                val subject = data.getSubject(
-                        subjectJson.getString("Przedmiot") ?: return@onEach,
-                        subjectJson.getLong("IdPrzedmiotu") ?: return@onEach,
-                        subjectJson.getString("Przedmiot") ?: return@onEach
-                )
-                subjectJson.getJsonArray("Oceny")?.asJsonObjectList()?.forEach { grade ->
-                    val id = grade.getLong("idK") ?: return@forEach
-                    val category = grade.getString("Kategoria") ?: ""
-                    val name = grade.getString("Ocena") ?: "?"
-                    val semester = grade.getInt("Semestr") ?: 1
-                    val teacher = data.getTeacherByLastFirst(grade.getString("Wystawil") ?: return@forEach)
-
-                    val countToAverage = grade.getBoolean("DoSredniej") ?: true
-                    var value = grade.getFloat("WartoscDoSred") ?: 0.0f
-                    val weight = if (countToAverage)
-                        grade.getFloat("Waga") ?: 0.0f
-                    else
-                        0.0f
-
-                    val gradeColor = grade.getString("Kolor") ?: ""
-                    var colorInt = 0xff2196f3.toInt()
-                    if (gradeColor.isNotEmpty()) {
-                        colorInt = Color.parseColor("#$gradeColor")
-                    }
-
-                    val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = id,
-                            name = name,
-                            type = TYPE_NORMAL,
-                            value = value,
-                            weight = weight,
-                            color = colorInt,
-                            category = category,
-                            description = null,
-                            comment = null,
-                            semester = semester,
-                            teacherId = teacher.id,
-                            subjectId = subject.id,
-                            addedDate = addedDate
-                    )
-
-                    when (grade.getInt("Typ")) {
-                        0 -> {
-                            val history = grade.getJsonArray("Historia")?.asJsonObjectList()
-                            if (history?.isNotEmpty() == true) {
-                                var sum = gradeObject.value * gradeObject.weight
-                                var count = gradeObject.weight
-                                for (historyItem in history) {
-                                    val countToTheAverage = historyItem.getBoolean("DoSredniej") ?: false
-                                    value = historyItem.get("WartoscDoSred").asFloat
-                                    val weight = historyItem.get("Waga").asFloat
-
-                                    if (value > 0 && countToTheAverage) {
-                                        sum += value * weight
-                                        count += weight
-                                    }
-
-                                    val historyColor = historyItem.getString("Kolor") ?: ""
-                                    colorInt = 0xff2196f3.toInt()
-                                    if (historyColor.isNotEmpty()) {
-                                        colorInt = Color.parseColor("#$historyColor")
-                                    }
-
-                                    val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis()
-
-                                    val historyObject = Grade(
-                                            profileId = profileId,
-                                            id = gradeObject.id * -1,
-                                            name = historyItem.getString("Ocena") ?: "",
-                                            type = TYPE_NORMAL,
-                                            value = value,
-                                            weight = if (value > 0f && countToTheAverage) weight * -1f else 0f,
-                                            color = colorInt,
-                                            category = historyItem.getString("Kategoria"),
-                                            description = historyItem.getString("Uzasadnienie"),
-                                            comment = null,
-                                            semester = historyItem.getInt("Semestr") ?: 1,
-                                            teacherId = teacher.id,
-                                            subjectId = subject.id,
-                                            addedDate = addedDate
-                                    )
-                                    historyObject.parentId = gradeObject.id
-
-                                    data.gradeList.add(historyObject)
-                                    data.metadataList.add(Metadata(
-                                            profileId,
-                                            Metadata.TYPE_GRADE,
-                                            historyObject.id,
-                                            true,
-                                            true
-                                    ))
-                                }
-                                // update the current grade's value with an average of all historical grades and itself
-                                if (sum > 0 && count > 0) {
-                                    gradeObject.value = sum / count
-                                }
-                                gradeObject.isImprovement = true // gradeObject is the improved grade. Originals are historyObjects
-                            }
-                        }
-                        1 -> {
-                            gradeObject.type = Grade.TYPE_SEMESTER1_FINAL
-                            gradeObject.name = value.toInt().toString()
-                            gradeObject.weight = 0f
-                        }
-                        2 -> {
-                            gradeObject.type = Grade.TYPE_YEAR_FINAL
-                            gradeObject.name = value.toInt().toString()
-                            gradeObject.weight = 0f
-                        }
-                    }
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(
-                            Metadata(
-                                    profileId,
-                                    Metadata.TYPE_GRADE,
-                                    id,
-                                    data.profile.empty,
-                                    data.profile.empty
-                            ))
-                }
-            }
-
-            data.toRemove.addAll(listOf(
-                    Grade.TYPE_NORMAL,
-                    Grade.TYPE_SEMESTER1_FINAL,
-                    Grade.TYPE_YEAR_FINAL
-            ).map {
-                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
-            })
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES)
-        }
-    } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_GRADES) }
-}

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

@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-25
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebHomework(override val data: DataIdziennik,
-                           override val lastSync: Long?,
-                           val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebHomework"
-    }
-
-    init {
-        val param = JsonObject().apply {
-            addProperty("strona", 1)
-            addProperty("iloscNaStrone", 997)
-            addProperty("iloscRekordow", -1)
-            addProperty("kolumnaSort", "DataZadania")
-            addProperty("kierunekSort", 0)
-            addProperty("maxIloscZaznaczonych", 0)
-            addProperty("panelFiltrow", 0)
-        }
-
-        webApiGet(TAG, IDZIENNIK_WEB_HOMEWORK, mapOf(
-                "idP" to data.registerId,
-                "data" to Date.getToday().stringY_m_d,
-                "wszystkie" to true,
-                "param" to param
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework ->
-                val id = homework.getLong("_recordId") ?: return@forEach
-                val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach)
-                val addedDate = Date.fromY_m_d(homework.getString("dataZ") ?: return@forEach)
-                val subjectName = homework.getString("przed") ?: return@forEach
-                val subjectId = data.getSubject(subjectName, null, subjectName).id
-                val teacherName = homework.getString("usr") ?: return@forEach
-                val teacherId = data.getTeacherByLastFirst(teacherName).id
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime
-                val topic = homework.getString("tytul")?.trim() ?: ""
-
-                val seen = when (profile?.empty) {
-                    true -> true
-                    else -> eventDate < Date.getToday()
-                }
-
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = eventDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = Event.TYPE_HOMEWORK,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = data.teamClass?.id ?: -1,
-                        addedDate = addedDate.inMillis
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_HOMEWORK,
-                        eventObject.id,
-                        seen,
-                        seen
-                ))
-            }
-
-            data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK))
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_HOMEWORK)
-        }
-    }
-}

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

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.crc16
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Notice
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEGATIVE
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_NEUTRAL
-import pl.szczodrzynski.edziennik.data.db.entity.Notice.Companion.TYPE_POSITIVE
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikWebNotices(override val data: DataIdziennik,
-                          override val lastSync: Long?,
-                          val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebNotices"
-    }
-
-    init {
-        webApiGet(TAG, IDZIENNIK_WEB_NOTICES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            for (jNoticeEl in json.getAsJsonArray("SUwaga")) {
-                val jNotice = jNoticeEl.asJsonObject
-                // jNotice
-                val noticeId = jNotice.get("id").asString.crc16().toLong()
-
-                val rTeacher = data.getTeacherByLastFirst(jNotice.get("Nauczyciel").asString)
-                val addedDate = Date.fromY_m_d(jNotice.get("Data").asString)
-
-                var nType = TYPE_NEUTRAL
-                val jType = jNotice.get("Typ").asString
-                if (jType == "n") {
-                    nType = TYPE_NEGATIVE
-                } else if (jType == "p") {
-                    nType = TYPE_POSITIVE
-                }
-
-                val noticeObject = Notice(
-                        profileId = profileId,
-                        id = noticeId,
-                        type = nType,
-                        semester = jNotice.get("Semestr").asInt,
-                        text = jNotice.getString("Tresc") ?: "",
-                        category = null,
-                        points = null,
-                        teacherId = rTeacher.id,
-                        addedDate = addedDate.inMillis
-                )
-
-                data.noticeList.add(noticeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_NOTICE,
-                        noticeObject.id,
-                        profile?.empty ?: false,
-                        profile?.empty ?: false
-                ))
-            }
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_NOTICES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_NOTICES)
-        }
-    }
-}

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

@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-28.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_MISSING_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Grade
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.getJsonArray
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
-
-class IdziennikWebProposedGrades(override val data: DataIdziennik,
-                                 override val lastSync: Long?,
-                                 val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebProposedGrades"
-    }
-
-    init { data.profile?.also { profile ->
-        webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf(
-                "idPozDziennika" to data.registerId
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-            val manager = data.app.gradesManager
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { subject ->
-                val subjectName = subject.getString("Przedmiot") ?: return@forEach
-                val subjectObject = data.getSubject(subjectName, null, subjectName)
-
-                val semester1Proposed = subject.getString("OcenaSem1") ?: ""
-                val semester1Value = manager.getGradeValue(semester1Proposed)
-                val semester1Id = subjectObject.id * (-100) - 1
-                val semester1Type =
-                        if (semester1Value == 0f) TYPE_DESCRIPTIVE
-                        else TYPE_SEMESTER1_PROPOSED
-                val semester1Name = when {
-                    semester1Value == 0f -> " "
-                    semester1Value % 1.0f == 0f -> semester1Value.toInt().toString()
-                    else -> semester1Value.toString()
-                }
-                val semester1Color =
-                        if (semester1Value == 0f) 0xff536dfe.toInt()
-                        else -1
-
-                val semester2Proposed = subject.getString("OcenaSem2") ?: ""
-                val semester2Value = manager.getGradeValue(semester2Proposed)
-                val semester2Id = subjectObject.id * (-100) - 2
-                val semester2Type =
-                        if (semester2Value == 0f) TYPE_DESCRIPTIVE
-                        else TYPE_YEAR_PROPOSED
-                val semester2Name = when {
-                    semester2Value == 0f -> " "
-                    semester2Value % 1.0f == 0f -> semester2Value.toInt().toString()
-                    else -> semester2Value.toString()
-                }
-                val semester2Color =
-                        if (semester2Value == 0f) 0xffff4081.toInt()
-                        else -1
-
-                if (semester1Proposed != "") {
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester1Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = semester1Id,
-                            name = semester1Name,
-                            type = semester1Type,
-                            value = semester1Value,
-                            weight = 0f,
-                            color = semester1Color,
-                            category = if (semester1Value == 0f) "Ocena opisowa semestralna" else null,
-                            description = if (semester1Value == 0f) semester1Proposed else null,
-                            comment = null,
-                            semester = 1,
-                            teacherId = -1,
-                            subjectId = subjectObject.id,
-                            addedDate = addedDate
-                    )
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile.empty,
-                            profile.empty
-                    ))
-                }
-
-                if (semester2Proposed != "") {
-                    val addedDate = if (data.profile.empty)
-                        data.profile.dateSemester2Start.inMillis
-                    else
-                        System.currentTimeMillis()
-
-                    val gradeObject = Grade(
-                            profileId = profileId,
-                            id = semester2Id,
-                            name = semester2Name,
-                            type = semester2Type,
-                            value = semester2Value,
-                            weight = 0f,
-                            color = semester2Color,
-                            category = if (semester2Value == 0f) "Ocena opisowa końcoworoczna" else null,
-                            description = if (semester2Value == 0f) semester2Proposed else null,
-                            comment = null,
-                            semester = 2,
-                            teacherId = -1,
-                            subjectId = subjectObject.id,
-                            addedDate = addedDate
-                    )
-
-                    data.gradeList.add(gradeObject)
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_GRADE,
-                            gradeObject.id,
-                            profile.empty,
-                            profile.empty
-                    ))
-                }
-            }
-
-            data.toRemove.addAll(listOf(TYPE_SEMESTER1_PROPOSED, TYPE_YEAR_PROPOSED).map {
-                DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it)
-            })
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES)
-        }
-    } ?: onSuccess(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES) }
-}

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

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

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

@@ -1,36 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOME
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
-
-class IdziennikWebSwitchRegister(override val data: DataIdziennik,
-                                 val registerId: Int,
-                                 val onSuccess: () -> Unit
-) : IdziennikWeb(data, null) {
-    companion object {
-        private const val TAG = "IdziennikWebSwitchRegister"
-    }
-
-    init {
-        val hiddenFields = data.loginStore.getLoginData("hiddenFields", JsonObject())
-        // TODO error checking
-
-        webGet(TAG, IDZIENNIK_WEB_HOME, mapOf(
-                "__VIEWSTATE" to hiddenFields.getString("__VIEWSTATE", ""),
-                "__VIEWSTATEGENERATOR" to hiddenFields.getString("__VIEWSTATEGENERATOR", ""),
-                "__EVENTVALIDATION" to hiddenFields.getString("__EVENTVALIDATION", ""),
-                "ctl00\$dxComboUczniowie" to registerId
-        )) { text ->
-            Regexes.IDZIENNIK_WEB_SELECTED_REGISTER.find(text)?.let {
-                val registerId = it[1].toIntOrNull() ?: return@let
-                data.webSelectedRegister = registerId
-            }
-            onSuccess()
-        }
-    }
-}

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

@@ -1,194 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-22
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
-import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Time
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class IdziennikWebTimetable(override val data: DataIdziennik,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : IdziennikWeb(data, lastSync) {
-    companion object {
-        private const val TAG = "IdziennikWebTimetable"
-    }
-
-    init { data.profile?.also { profile ->
-        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)
-
-        webApiGet(TAG, IDZIENNIK_WEB_TIMETABLE, mapOf(
-                "idPozDziennika" to data.registerId,
-                "pidRokSzkolny" to data.schoolYearId,
-                "data" to "${weekStart.stringY_m_d}T10:00:00.000Z"
-        )) { result ->
-            val json = result.getJsonObject("d") ?: run {
-                data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA)
-                        .withApiResponse(result))
-                return@webApiGet
-            }
-
-            json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEachIndexed { index, range ->
-                val lessonRange = LessonRange(
-                        profileId,
-                        index + 1,
-                        range.getString("Poczatek")?.let { Time.fromH_m(it) }
-                                ?: return@forEachIndexed,
-                        range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEachIndexed
-                )
-                data.lessonRanges[lessonRange.lessonNumber] = lessonRange
-            }
-
-            val dates = mutableSetOf<Int>()
-            val lessons = mutableListOf<Lesson>()
-
-            json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { lesson ->
-                val subject = data.getSubject(
-                        lesson.getString("Nazwa") ?: return@forEach,
-                        lesson.getLong("Id"),
-                        lesson.getString("Skrot") ?: ""
-                )
-                val teacher = data.getTeacherByFDotLast(lesson.getString("Nauczyciel")
-                        ?: return@forEach)
-
-                val newSubjectName = lesson.getString("PrzedmiotZastepujacy")
-                val newSubject = when (newSubjectName.isNullOrBlank()) {
-                    true -> null
-                    else -> data.getSubject(newSubjectName, null, newSubjectName)
-                }
-
-                val newTeacherName = lesson.getString("NauZastepujacy")
-                val newTeacher = when (newTeacherName.isNullOrBlank()) {
-                    true -> null
-                    else -> data.getTeacherByFDotLast(newTeacherName)
-                }
-
-                val weekDay = lesson.getInt("DzienTygodnia")?.minus(1) ?: return@forEach
-                val lessonRange = data.lessonRanges[lesson.getInt("Godzina")?.plus(1)
-                        ?: return@forEach]
-                val lessonDate = weekStart.clone().stepForward(0, 0, weekDay)
-                val classroom = lesson.getString("NazwaSali")
-
-                val type = lesson.getInt("TypZastepstwa") ?: -1
-
-                val lessonObject = Lesson(profileId, -1)
-
-                when (type) {
-                    1, 2, 3, 4, 5 -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_CHANGE
-
-                            this.date = lessonDate
-                            this.lessonNumber = lessonRange.lessonNumber
-                            this.startTime = lessonRange.startTime
-                            this.endTime = lessonRange.endTime
-                            this.subjectId = newSubject?.id
-                            this.teacherId = newTeacher?.id
-                            this.teamId = data.teamClass?.id
-                            this.classroom = classroom
-
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonRange.lessonNumber
-                            this.oldStartTime = lessonRange.startTime
-                            this.oldEndTime = lessonRange.endTime
-                            this.oldSubjectId = subject.id
-                            this.oldTeacherId = teacher.id
-                            this.oldTeamId = data.teamClass?.id
-                            this.oldClassroom = classroom
-                        }
-                    }
-                    0 -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_CANCELLED
-
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonRange.lessonNumber
-                            this.oldStartTime = lessonRange.startTime
-                            this.oldEndTime = lessonRange.endTime
-                            this.oldSubjectId = subject.id
-                            this.oldTeacherId = teacher.id
-                            this.oldTeamId = data.teamClass?.id
-                            this.oldClassroom = classroom
-                        }
-                    }
-                    else -> {
-                        lessonObject.apply {
-                            this.type = Lesson.TYPE_NORMAL
-
-                            this.date = lessonDate
-                            this.lessonNumber = lessonRange.lessonNumber
-                            this.startTime = lessonRange.startTime
-                            this.endTime = lessonRange.endTime
-                            this.subjectId = subject.id
-                            this.teacherId = teacher.id
-                            this.teamId = data.teamClass?.id
-                            this.classroom = classroom
-                        }
-                    }
-                }
-
-                lessonObject.id = lessonObject.buildId()
-
-                dates.add(lessonDate.value)
-                lessons.add(lessonObject)
-
-                val seen = profile.empty || lessonDate < Date.getToday()
-
-                if (lessonObject.type != Lesson.TYPE_NORMAL && lessonDate >= Date.getToday()) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            lessonObject.id,
-                            seen,
-                            seen
-                    ))
-                }
-            }
-
-            val date: Date = weekStart.clone()
-            while (date <= weekEnd) {
-                if (!dates.contains(date.value)) {
-                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
-                        this.type = Lesson.TYPE_NO_LESSONS
-                        this.date = date.clone()
-                    })
-                }
-
-                date.stepForward(0, 0, 1)
-            }
-
-            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
-
-            data.lessonList.addAll(lessons)
-            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
-
-            data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_IDZIENNIK_WEB_TIMETABLE)
-        }
-    }}
-}

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

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin
-
-import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR
-import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SETTINGS
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_IDZIENNIK
-import pl.szczodrzynski.edziennik.data.api.Regexes
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb
-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.fixName
-import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.set
-import pl.szczodrzynski.edziennik.swapFirstLastName
-
-class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikFirstLogin"
-    }
-
-    private val web = IdziennikWeb(data, null)
-    private val profileList = mutableListOf<Profile>()
-
-    init {
-        val loginStoreId = data.loginStore.id
-        val loginStoreType = LOGIN_TYPE_IDZIENNIK
-        var firstProfileId = loginStoreId
-
-        IdziennikLoginWeb(data) {
-            web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text ->
-                //val accounts = json.getJsonArray("accounts")
-
-                val isParent = Regexes.IDZIENNIK_LOGIN_FIRST_IS_PARENT.find(text)?.get(1) != "0"
-                val accountNameLong = if (isParent)
-                    Regexes.IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME.find(text)?.get(1)?.swapFirstLastName()?.fixName()
-                else null
-
-                var schoolYearStart: Int? = null
-                var schoolYearEnd: Int? = null
-                var schoolYearName: String? = null
-                val schoolYearId = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
-                    schoolYearName = it[2]+"/"+it[3]
-                    schoolYearStart = it[2].toIntOrNull()
-                    schoolYearEnd = it[3].toIntOrNull()
-                    it[1].toIntOrNull()
-                } ?: run {
-                    data.error(ApiError(TAG, ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR)
-                            .withApiResponse(text))
-                    return@webGet
-                }
-
-                Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
-                        .toMutableList()
-                        .reversed()
-                        .forEach { match ->
-                            val registerId = match[1].toIntOrNull() ?: return@forEach
-                            val studentId = match[2]
-                            val firstName = match[3]
-                            val lastName = match[4]
-                            val className = match[5] + " " + match[6]
-
-                            val studentNameLong = "$firstName $lastName".fixName()
-                            val studentNameShort = "$firstName ${lastName[0]}.".fixName()
-                            val accountName = if (accountNameLong == studentNameLong) null else accountNameLong
-
-                            val profile = Profile(
-                                    firstProfileId++,
-                                    loginStoreId,
-                                    loginStoreType,
-                                    studentNameLong,
-                                    data.webUsername,
-                                    studentNameLong,
-                                    studentNameShort,
-                                    accountName
-                            ).apply {
-                                schoolYearStart?.let { studentSchoolYearStart = it }
-                                studentClassName = className
-                                studentData["studentId"] = studentId
-                                studentData["registerId"] = registerId
-                                studentData["schoolYearId"] = schoolYearId
-                            }
-                            profileList.add(profile)
-                        }
-
-                EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
-                onSuccess()
-            }
-        }
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-25. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.utils.Utils
-
-class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLogin"
-    }
-
-    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_IDZIENNIK_WEB -> {
-                data.startProgress(R.string.edziennik_progress_login_idziennik_web)
-                IdziennikLoginWeb(data) { onSuccess(loginMethodId) }
-            }
-            LOGIN_METHOD_IDZIENNIK_API -> {
-                data.startProgress(R.string.edziennik_progress_login_idziennik_api)
-                IdziennikLoginApi(data) { onSuccess(loginMethodId) }
-            }
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-27. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-
-class IdziennikLoginApi(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLoginApi"
-    }
-
-    init { run {
-        if (data.isApiLoginValid()) {
-            onSuccess()
-        }
-        else {
-            onSuccess()
-        }
-    }}
-}

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

@@ -1,178 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-26.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
-
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.TextCallbackHandler
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "IdziennikLoginWeb"
-    }
-
-    init { run {
-        if (data.isWebLoginValid()) {
-            data.app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", data.webSessionId)
-            data.app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", data.webAuth)
-            onSuccess()
-        }
-        else {
-            data.app.cookieJar.clear("iuczniowie.progman.pl")
-            if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) {
-                loginWithCredentials()
-            }
-            else {
-                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
-            }
-        }
-    }}
-
-    private fun loginWithCredentials() {
-        Utils.d(TAG, "Request: Idziennik/Login/Web - $IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-
-        val loginCallback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                if (text.isNullOrEmpty()) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                // login succeeded: there is a start page
-                if (text.contains("czyWyswietlicDostepMobilny")) {
-                    val cookies = data.app.cookieJar.getAll("iuczniowie.progman.pl")
-                    run {
-                        data.webSessionId = cookies["ASP.NET_SessionId_iDziennik"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
-                        data.webAuth = cookies[".ASPXAUTH"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
-                        data.apiBearer = cookies["Bearer"]?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
-                        data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */
-                        data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */
-
-                        val hiddenFields = JsonObject()
-                        Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text).forEach {
-                            hiddenFields[it[1]] = it[2]
-                        }
-                        data.loginStore.putLoginData("hiddenFields", hiddenFields)
-
-                        Regexes.IDZIENNIK_WEB_SELECTED_REGISTER.find(text)?.let {
-                            val registerId = it[1].toIntOrNull() ?: return@let
-                            data.webSelectedRegister = registerId
-                        }
-
-                        // for profiles created after archiving
-                        data.schoolYearId = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let {
-                            it[1].toIntOrNull()
-                        } ?: data.schoolYearId
-                        data.profile?.studentClassName = Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text)
-                                .firstOrNull { it[1].toIntOrNull() == data.registerId }
-                                ?.let { "${it[5]} ${it[6]}" } ?: data.profile?.studentClassName
-
-                        data.profile?.let { profile ->
-                            Regexes.IDZIENNIK_WEB_LUCKY_NUMBER.find(text)?.also {
-                                val number = it[1].toIntOrNull() ?: return@also
-                                val luckyNumberObject = LuckyNumber(
-                                        profileId = data.profileId,
-                                        date = Date.getToday(),
-                                        number = number
-                                )
-
-                                data.luckyNumberList.add(luckyNumberObject)
-                                data.metadataList.add(
-                                        Metadata(
-                                                profile.id,
-                                                Metadata.TYPE_LUCKY_NUMBER,
-                                                luckyNumberObject.date.value.toLong(),
-                                                true,
-                                                profile.empty
-                                        ))
-                            }
-                        }
-
-                        return@run null
-                    }?.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(text)
-                                .withResponse(response))
-                        return
-                    }
-
-                    onSuccess()
-                    return
-                }
-
-                val errorText = Regexes.IDZIENNIK_LOGIN_ERROR.find(text)?.get(1)
-                when {
-                    errorText?.contains("nieprawidłową nazwę szkoły") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME
-                    errorText?.contains("nieprawidłowy login lub hasło") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN
-                    text.contains("Identyfikator zgłoszenia") -> ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR
-                    text.contains("Hasło dostępu do systemu wygasło") -> ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED
-                    text.contains("Trwają prace konserwacyjne") -> ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE
-                    else -> ERROR_LOGIN_IDZIENNIK_WEB_OTHER
-                }.let { errorCode ->
-                    data.error(ApiError(TAG, errorCode)
-                            .withApiResponse(text)
-                            .withResponse(response))
-                    return
-                }
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        val getCallback = object : TextCallbackHandler() {
-            override fun onSuccess(text: String?, response: Response?) {
-                Request.builder()
-                        .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                        .userAgent(IDZIENNIK_USER_AGENT)
-                        .addHeader("Origin", "https://iuczniowie.progman.pl")
-                        .addHeader("Referer", "$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                        .apply {
-                            Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text ?: return@apply).forEach {
-                                addParameter(it[1], it[2])
-                            }
-                        }
-                        .addParameter("ctl00\$ContentPlaceHolder\$nazwaPrzegladarki", IDZIENNIK_USER_AGENT)
-                        .addParameter("ctl00\$ContentPlaceHolder\$NazwaSzkoly", data.webSchoolName)
-                        .addParameter("ctl00\$ContentPlaceHolder\$UserName", data.webUsername)
-                        .addParameter("ctl00\$ContentPlaceHolder\$Password", data.webPassword)
-                        .addParameter("ctl00\$ContentPlaceHolder\$captcha", "")
-                        .addParameter("ctl00\$ContentPlaceHolder\$Logowanie", "Zaloguj")
-                        .post()
-                        .allowErrorCode(502)
-                        .callback(loginCallback)
-                        .build()
-                        .enqueue()
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        Request.builder()
-                .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN")
-                .userAgent(IDZIENNIK_USER_AGENT)
-                .get()
-                .allowErrorCode(502)
-                .callback(getCallback)
-                .build()
-                .enqueue()
-    }
-}

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,102 +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()
+                val count = ranges.count()
-                    // verify the lesson count is the same as dates & entries
+                // verify the lesson count is the same as dates & entries
-                    if (count != lessonDates.count() || count != entries.count())
+                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 startTime = Time.fromH_m(range[1])
-                        val lessonDate = dateIterator.next()
-                        var entry = entriesIterator.next()
-                        if (entry.isBlank())
-                            return@forEach
-                        val startTime = Time.fromH_m(range[1])
 
-                        range[2].split(" / ").mapNotNull { Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it) }.forEachIndexed { index, lesson ->
+                    range[2].split(" / ").mapNotNull {
-                            val topic = lesson[1].substringAfter(" - ", missingDelimiterValue = "").takeIf { it.isNotBlank() }
+                        Regexes.MOBIDZIENNIK_ATTENDANCE_LESSON.find(it)
-                            if (topic?.startsWith("Lekcja odwołana: ") == true || entry.isEmpty())
+                    }.forEachIndexed { index, lesson ->
-                                return@forEachIndexed
+                        processEntry(
-                            val subjectName = lesson[1].substringBefore(" - ")
+                                index,
-                            //val team = lesson[3]
+                                lesson,
-                            val teacherName = lesson[3].fixName()
+                                lessonDate,
-
+                                startTime,
-                            val teacherId = data.teacherList.singleOrNull { it.fullNameLastFirst == teacherName }?.id ?: -1
+                                entry,
-                            val subjectId = data.subjectList.singleOrNull { it.longName == subjectName }?.id ?: -1
+                                types,
-
+                                typeSymbols
-                            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
-                                        ))
-                            }
-                        }
                     }
                 }
             }
@@ -206,4 +159,98 @@ 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(" - ").trim()
+        //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 isCustom = false
+        val baseType = when (typeSymbol) {
+            "." -> TYPE_PRESENT
+            "|" -> TYPE_ABSENT
+            "+" -> TYPE_ABSENT_EXCUSED
+            "s" -> TYPE_BELATED
+            "z" -> TYPE_RELEASED
+            else -> {
+                isCustom = true
+                when (typeSymbol) {
+                    "e" -> TYPE_PRESENT_CUSTOM
+                    "en" -> TYPE_ABSENT
+                    "ep" -> TYPE_PRESENT_CUSTOM
+                    "+ₑ" -> TYPE_ABSENT_EXCUSED
+                    else -> TYPE_UNKNOWN
+                }
+            }
+        }
+        val typeName = types?.get(typeSymbol) ?: ""
+        val typeColor = when (typeSymbol) {
+            "e" -> 0xff673ab7
+            "en" -> 0xffec407a
+            "ep" -> 0xff4caf50
+            "+ₑ" -> 0xff795548
+            else -> null
+        }?.toInt()
+
+        val typeShort = if (!isCustom)
+            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
+        }
+
+        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/data/web/MobidziennikWebGetMessage.kt

@@ -74,16 +74,16 @@ class MobidziennikWebGetMessage(override val data: DataMobidziennik,
                 message.senderId = null
 
                 content.select("table.spis tr:has(td)")?.forEach { recipientEl ->
-                    val senderEl = recipientEl.select("td:eq(0)").first()
+                    val senderEl = recipientEl.select("td:eq(1)")?.first() ?: return@forEach
                     val senderName = senderEl.text().fixName()
 
                     val teacher = data.teacherList.singleOrNull { it.fullNameLastFirst == senderName }
                     val receiverId = teacher?.id ?: -1
 
                     var readDate = 0L
-                    val isReadEl = recipientEl.select("td:eq(2)").first()
+                    val isReadEl = recipientEl.select("td:eq(4)")?.first() ?: return@forEach
-                    if (isReadEl.ownText() != "NIE") {
+                    if (isReadEl.html().contains("tak")) {
-                        val readDateEl = recipientEl.select("td:eq(3) small").first()
+                        val readDateEl = recipientEl.select("td:eq(5) small")?.first() ?: return@forEach
                         Regexes.MOBIDZIENNIK_MESSAGE_SENT_READ_DATE.find(readDateEl.ownText())?.let {
                             val date = Date(
                                     it[3].toIntOrNull() ?: 2019,

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

@@ -56,20 +56,21 @@ class MobidziennikWebGetRecipientList(override val data: DataMobidziennik,
     }
 
     private fun processRecipient(listType: Int, listName: String, recipient: JsonObject) {
-        val id = recipient.getLong("id") ?: -1
+        val id = recipient.getString("id") ?: return
+        val idLong = id.replace(Regexes.NOT_DIGITS, "").toLongOrNull() ?: return
         // get teacher by ID or create it
-        val teacher = data.teacherList[id] ?: Teacher(data.profileId, id).apply {
+        val teacher = data.teacherList[idLong] ?: Teacher(data.profileId, idLong).apply {
             val fullName = recipient.getString("nazwa")?.fixName()
             name = fullName ?: ""
             fullName?.splitName()?.let {
                 name = it.second
                 surname = it.first
             }
-            data.teacherList[id] = this
+            data.teacherList[idLong] = this
         }
 
         teacher.apply {
-            loginId = id.toString()
+            loginId = id
             when (listType) {
                 1 -> setTeacherType(Teacher.TYPE_PRINCIPAL)
                 2 -> setTeacherType(Teacher.TYPE_TEACHER)

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

@@ -46,7 +46,7 @@ class MobidziennikWebGrades(override val data: DataMobidziennik,
                 when (e.tagName()) {
                     "div" -> {
                         Regexes.MOBIDZIENNIK_GRADES_SUBJECT_NAME.find(e.outerHtml())?.let {
-                            subjectName = it[1]
+                            subjectName = it[1].trim()
                         }
                     }
                     "span" -> {

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

@@ -7,6 +7,7 @@ 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_LOGOUT_DEVICES_ENDPOINT
 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
@@ -22,50 +23,62 @@ class PodlasieFirstLogin(val data: DataPodlasie, val onSuccess: () -> Unit) {
     private val api = PodlasieApi(data, null)
 
     init {
+        PodlasieLoginApi(data) {
+            doLogin()
+        }
+    }
+
+    private fun doLogin() {
         val loginStoreId = data.loginStore.id
         val loginStoreType = LOGIN_TYPE_PODLASIE
 
-        PodlasieLoginApi(data) {
+        if (data.loginStore.getLoginData("logoutDevices", false)) {
-            api.apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json ->
+            data.loginStore.removeLoginData("logoutDevices")
-                val uuid = json.getString("Uuid")
+            api.apiGet(TAG, PODLASIE_API_LOGOUT_DEVICES_ENDPOINT) {
-                val login = json.getString("Login")
+                doLogin()
-                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()
             }
+            return
+        }
+
+        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/vulcan/DataVulcan.kt

@@ -4,57 +4,50 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 
+import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.crc16
 import pl.szczodrzynski.edziennik.currentTimeUnix
-import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE
+import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN
 import pl.szczodrzynski.edziennik.data.api.models.Data
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.data.db.entity.Team
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
-import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.fslogin.realm.RealmData
-import pl.szczodrzynski.edziennik.values
 
 class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
-
+    fun isWebMainLoginValid() = symbol.isNotNullNorEmpty()
-    fun isWebMainLoginValid() = webExpiryTime-30 > currentTimeUnix()
+            && (webExpiryTime[symbol]?.toLongOrNull() ?: 0) - 30 > currentTimeUnix()
-            && webAuthCookie.isNotNullNorEmpty()
+            && webAuthCookie[symbol].isNotNullNorEmpty()
-            && webHost.isNotNullNorEmpty()
+            && webRealmData != null
-            && webType.isNotNullNorEmpty()
+    fun isHebeLoginValid() = hebePublicKey.isNotNullNorEmpty()
-            && symbol.isNotNullNorEmpty()
+            && hebePrivateKey.isNotNullNorEmpty()
-    fun isApiLoginValid() = currentSemesterEndDate-30 > currentTimeUnix()
-            && apiFingerprint[symbol].isNotNullNorEmpty()
-            && apiPrivateKey[symbol].isNotNullNorEmpty()
             && symbol.isNotNullNorEmpty()
 
     override fun satisfyLoginMethods() {
         loginMethods.clear()
-        if (isApiLoginValid()) {
+        if (isWebMainLoginValid()) {
-            loginMethods += LOGIN_METHOD_VULCAN_API
+            loginMethods += LOGIN_METHOD_VULCAN_WEB_MAIN
         }
-    }
+        if (isHebeLoginValid()) {
-
+            loginMethods += LOGIN_METHOD_VULCAN_HEBE
-    init {
-        // during the first sync `profile.studentClassName` is already set
-        if (teamList.values().none { it.type == Team.TYPE_CLASS }) {
-            profile?.studentClassName?.also { name ->
-                val id = Utils.crc16(name.toByteArray()).toLong()
-
-                val teamObject = Team(
-                        profileId,
-                        id,
-                        name,
-                        Team.TYPE_CLASS,
-                        "$schoolCode:$name",
-                        -1
-                )
-                teamList.put(id, teamObject)
-            }
         }
     }
 
     override fun generateUserCode() = "$schoolCode:$studentId"
 
+    fun buildDeviceId(): String {
+        val deviceId = app.deviceId.padStart(16, '0')
+        val loginStoreId = loginStore.id.toString(16).padStart(4, '0')
+        val symbol = symbol?.crc16()?.toString(16)?.take(2) ?: "00"
+        return deviceId.substring(0..7) +
+                "-" + deviceId.substring(8..11) +
+                "-" + deviceId.substring(12..15) +
+                "-" + loginStoreId +
+                "-" + symbol + "6f72616e7a"
+    }
+
     /**
      * A UONET+ client symbol.
      *
@@ -139,6 +132,16 @@ 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 mStudentUnitId: Int? = null
+    var studentUnitId: Int
+        get() { mStudentUnitId = mStudentUnitId ?: profile?.getStudentData("studentUnitId", 0); return mStudentUnitId ?: 0 }
+        set(value) { profile?.putStudentData("studentUnitId", value) ?: return; mStudentUnitId = value }
+
+    private var mStudentConstituentId: Int? = null
+    var studentConstituentId: Int
+        get() { mStudentConstituentId = mStudentConstituentId ?: profile?.getStudentData("studentConstituentId", 0); return mStudentConstituentId ?: 0 }
+        set(value) { profile?.putStudentData("studentConstituentId", value) ?: return; mStudentConstituentId = value }
+
     private var mSemester1Id: Int? = null
     var semester1Id: Int
         get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 }
@@ -193,15 +196,31 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
         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 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 }
+         |  __  |/ _ \ '_ \ / _ \   / /\ \ |  ___/ | |  
+         | |  | |  __/ |_) |  __/  / ____ \| |    _| |_ 
+         |_|  |_|\___|_.__/ \___| /_/    \_\_|   |____*/
+    private var mHebePublicKey: String? = null
+    var hebePublicKey: String?
+        get() { mHebePublicKey = mHebePublicKey ?: loginStore.getLoginData("hebePublicKey", null); return mHebePublicKey }
+        set(value) { loginStore.putLoginData("hebePublicKey", value); mHebePublicKey = value }
 
-    private var mApiPrivateKey: Map<String?, String?>? = null
+    private var mHebePrivateKey: String? = null
-    var apiPrivateKey: Map<String?, String?> = mapOf()
+    var hebePrivateKey: String?
-        get() { mApiPrivateKey = mApiPrivateKey ?: loginStore.getLoginData("apiPrivateKey", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPrivateKey ?: mapOf() }
+        get() { mHebePrivateKey = mHebePrivateKey ?: loginStore.getLoginData("hebePrivateKey", null); return mHebePrivateKey }
-        set(value) { loginStore.putLoginData("apiPrivateKey", app.gson.toJson(value)); mApiPrivateKey = value }
+        set(value) { loginStore.putLoginData("hebePrivateKey", value); mHebePrivateKey = value }
+
+    private var mHebePublicHash: String? = null
+    var hebePublicHash: String?
+        get() { mHebePublicHash = mHebePublicHash ?: loginStore.getLoginData("hebePublicHash", null); return mHebePublicHash }
+        set(value) { loginStore.putLoginData("hebePublicHash", value); mHebePublicHash = value }
+
+    private var mHebeContext: String? = null
+    var hebeContext: String?
+        get() { mHebeContext = mHebeContext ?: profile?.getStudentData("hebeContext", null); return mHebeContext }
+        set(value) { profile?.putStudentData("hebeContext", value) ?: return; mHebeContext = value }
 
     val apiUrl: String?
         get() {
@@ -219,6 +238,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
                 "P01" -> "http://efeb-komunikacja.pro-hudson.win.vulcan.pl"
                 "P02" -> "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl"
                 "P90" -> "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl"
+                "KO1" -> "https://uonetplus-komunikacja.eduportal.koszalin.pl"
                 "FK1", "FS1" -> "http://api.fakelog.cf"
                 "SZ9" -> "http://hack.szkolny.eu"
                 else -> null
@@ -226,7 +246,7 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
             return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null)
         }
 
-    val fullApiUrl: String?
+    val fullApiUrl: String
         get() {
             return "$apiUrl$schoolSymbol/"
         }
@@ -239,49 +259,15 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
              \/  \/ \___|_.__/  |_|   |_____/  |______\___/ \__, |_|_| |_|
                                                              __/ |
                                                             |__*/
-    /**
+    var webRealmData: RealmData?
-     * Federation Services login type.
+        get() { mWebRealmData = mWebRealmData ?: loginStore.getLoginData("webRealmData", JsonObject()).let {
-     * This might be one of: cufs, adfs, adfslight.
+                app.gson.fromJson(it, RealmData::class.java)
-     */
+            }; return mWebRealmData }
-    var webType: String?
+        set(value) { loginStore.putLoginData("webRealmData", app.gson.toJsonTree(value) as JsonObject); mWebRealmData = value }
-        get() { mWebType = mWebType ?: loginStore.getLoginData("webType", null); return mWebType }
+    private var mWebRealmData: RealmData? = null
-        set(value) { loginStore.putLoginData("webType", value); mWebType = value }
-    private var mWebType: String? = null
 
-    /**
+    val webHost
-     * Web server providing the federation services login.
+        get() = webRealmData?.host
-     * 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 }
@@ -301,24 +287,24 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
      * If the time passes, the certificate needs to be POSTed again (if valid)
      * or re-generated.
      */
-    var webExpiryTime: Long
+    var webExpiryTime: Map<String, String?> = mapOf()
-        get() { mWebExpiryTime = mWebExpiryTime ?: profile?.getStudentData("webExpiryTime", 0L); return mWebExpiryTime ?: 0L }
+        get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() }
-        set(value) { profile?.putStudentData("webExpiryTime", value); mWebExpiryTime = value }
+        set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value }
-    private var mWebExpiryTime: Long? = null
+    private var mWebExpiryTime: Map<String, String?>? = null
 
     /**
      * EfebSsoAuthCookie retrieved after posting a certificate
      */
-    var webAuthCookie: String?
+    var webAuthCookie: Map<String, String?> = mapOf()
-        get() { mWebAuthCookie = mWebAuthCookie ?: profile?.getStudentData("webAuthCookie", null); return mWebAuthCookie }
+        get() { mWebAuthCookie = mWebAuthCookie ?: loginStore.getLoginData("webAuthCookie", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebAuthCookie ?: mapOf() }
-        set(value) { profile?.putStudentData("webAuthCookie", value); mWebAuthCookie = value }
+        set(value) { loginStore.putLoginData("webAuthCookie", app.gson.toJson(value)); mWebAuthCookie = value }
-    private var mWebAuthCookie: String? = null
+    private var mWebAuthCookie: Map<String, String?>? = null
 
     /**
      * Permissions needed to get JSONs from home page
      */
-    var webPermissions: String?
+    var webPermissions: Map<String, String?> = mapOf()
-        get() { mWebPermissions = mWebPermissions ?: profile?.getStudentData("webPermissions", null); return mWebPermissions }
+        get() { mWebPermissions = mWebPermissions ?: loginStore.getLoginData("webPermissions", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebPermissions ?: mapOf() }
-        set(value) { profile?.putStudentData("webPermissions", value); mWebPermissions = value }
+        set(value) { loginStore.putLoginData("webPermissions", app.gson.toJson(value)); mWebPermissions = value }
-    private var mWebPermissions: String? = null
+    private var mWebPermissions: Map<String, String?>? = null
 }

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

@@ -10,9 +10,8 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.helper.OneDriveDownloadAttachment
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiAttachments
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMessagesChangeStatus
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeSendMessage
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiSendMessage
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
@@ -67,6 +66,11 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) {
+        if (data.loginStore.mode == LOGIN_MODE_VULCAN_API) {
+            data.error(TAG, ERROR_VULCAN_API_DEPRECATED)
+            return
+        }
+
         d(TAG, "Trying to login with ${data.targetLoginMethodIds}")
         if (internalErrorList.isNotEmpty()) {
             d(TAG, "  - Internal errors:")
@@ -91,37 +95,21 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     override fun getMessage(message: MessageFull) {
-        login(LOGIN_METHOD_VULCAN_API) {
+        login(LOGIN_METHOD_VULCAN_HEBE) {
-            if (message.attachmentIds != null) {
+            if (message.seen) {
-                VulcanApiMessagesChangeStatus(data, message) {
+                EventBus.getDefault().postSticky(MessageGetEvent(message))
-                    completed()
+                completed()
-                }
                 return@login
             }
-            val list = data.app.db.messageDao().getAllNow(data.profileId)
+            VulcanHebeMessagesChangeStatus(data, message) {
-            VulcanApiAttachments(data, list, message, MessageFull::class) { _ ->
+                completed()
-                list.forEach {
-                    if (it.attachmentIds == null)
-                        it.attachmentIds = mutableListOf()
-                    data.messageList.add(it)
-                }
-                data.messageListReplace = true
-
-                if (message.seen) {
-                    EventBus.getDefault().postSticky(MessageGetEvent(message))
-                    completed()
-                    return@VulcanApiAttachments
-                }
-                VulcanApiMessagesChangeStatus(data, message) {
-                    completed()
-                }
             }
         }
     }
 
     override fun sendMessage(recipients: List<Teacher>, subject: String, text: String) {
-        login(LOGIN_METHOD_VULCAN_API) {
+        login(LOGIN_METHOD_VULCAN_HEBE) {
-            VulcanApiSendMessage(data, recipients, subject, text) {
+            VulcanHebeSendMessage(data, recipients, subject, text) {
                 completed()
             }
         }
@@ -175,19 +163,10 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
     }
 
     override fun getEvent(eventFull: EventFull) {
-        login(LOGIN_METHOD_VULCAN_API) {
+        eventFull.homeworkBody = ""
-            val list = data.app.db.eventDao().getAllNow(data.profileId).filter { !it.addedManually }
-            VulcanApiAttachments(data, list, eventFull, EventFull::class) { _ ->
-                list.forEach {
-                    it.homeworkBody = ""
-                    data.eventList.add(it)
-                }
-                data.eventListReplace = true
 
-                EventBus.getDefault().postSticky(EventGetEvent(eventFull))
+        EventBus.getDefault().postSticky(EventGetEvent(eventFull))
-                completed()
+        completed()
-            }
-        }
     }
 
     override fun firstLogin() { VulcanFirstLogin(data) { completed() } }

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

@@ -7,58 +7,60 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.models.Feature
 
-const val ENDPOINT_VULCAN_API_UPDATE_SEMESTER     = 1000
-const val ENDPOINT_VULCAN_API_PUSH_CONFIG         = 1005
-const val ENDPOINT_VULCAN_API_DICTIONARIES        = 1010
-const val ENDPOINT_VULCAN_API_TIMETABLE           = 1020
-const val ENDPOINT_VULCAN_API_EVENTS = 1030
-const val ENDPOINT_VULCAN_API_GRADES              = 1040
-const val ENDPOINT_VULCAN_API_GRADES_SUMMARY      = 1050
-const val ENDPOINT_VULCAN_API_HOMEWORK            = 1060
-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
 
+const val ENDPOINT_VULCAN_HEBE_MAIN               = 3000
+const val ENDPOINT_VULCAN_HEBE_PUSH_CONFIG        = 3005
+const val ENDPOINT_VULCAN_HEBE_ADDRESSBOOK        = 3010
+const val ENDPOINT_VULCAN_HEBE_TIMETABLE          = 3020
+const val ENDPOINT_VULCAN_HEBE_EXAMS              = 3030
+const val ENDPOINT_VULCAN_HEBE_GRADES             = 3040
+const val ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY      = 3050
+const val ENDPOINT_VULCAN_HEBE_HOMEWORK           = 3060
+const val ENDPOINT_VULCAN_HEBE_NOTICES            = 3070
+const val ENDPOINT_VULCAN_HEBE_ATTENDANCE         = 3080
+const val ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX     = 3090
+const val ENDPOINT_VULCAN_HEBE_MESSAGES_SENT      = 3100
+const val ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER       = 3200
+
 val VulcanFeatures = listOf(
         // timetable
         Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf(
-                ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_TIMETABLE to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // agenda
         Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf(
-                ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_EXAMS to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // grades
         Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf(
-                ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API,
+                ENDPOINT_VULCAN_HEBE_GRADES to LOGIN_METHOD_VULCAN_HEBE,
-                ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // homework
         Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf(
-                ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_HOMEWORK to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // behaviour
         Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf(
-                ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_NOTICES to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // attendance
         Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf(
-                ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_ATTENDANCE to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         // messages
         Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf(
-                ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
         Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf(
-                ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_MESSAGES_SENT to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)),
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)),
 
         // push config
         Feature(LOGIN_TYPE_VULCAN, FEATURE_PUSH_CONFIG, listOf(
-                ENDPOINT_VULCAN_API_PUSH_CONFIG to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_PUSH_CONFIG to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API)).withShouldSync { data ->
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE)).withShouldSync { data ->
                 !data.app.config.sync.tokenVulcanList.contains(data.profileId)
         },
 
@@ -67,35 +69,20 @@ val VulcanFeatures = listOf(
          */
         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() },
+        ), listOf(LOGIN_METHOD_VULCAN_WEB_MAIN))
+                .withShouldSync { data -> data.shouldSyncLuckyNumber() }
+                .withPriority(2),
+        /**
+         * Lucky number - using Hebe API
+         */
+        Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf(
+                ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER to LOGIN_METHOD_VULCAN_HEBE
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE))
+                .withShouldSync { data -> data.shouldSyncLuckyNumber() }
+                .withPriority(1),
 
         Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf(
-                ENDPOINT_VULCAN_API_UPDATE_SEMESTER to LOGIN_METHOD_VULCAN_API,
+                ENDPOINT_VULCAN_HEBE_MAIN to LOGIN_METHOD_VULCAN_HEBE,
-                ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API
+                ENDPOINT_VULCAN_HEBE_ADDRESSBOOK to LOGIN_METHOD_VULCAN_HEBE
-        ), listOf(LOGIN_METHOD_VULCAN_API))
+        ), listOf(LOGIN_METHOD_VULCAN_HEBE))
-        /*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_NUMBER, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_SCHOOL_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASS_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEAM_INFO, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_TEACHERS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_SUBJECTS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),
-        Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASSROOMS, listOf(
-                ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB
-        ), listOf(LOGIN_METHOD_VULCAN_WEB)),*/
-
 )

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

@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import im.wangchao.mhttp.Request
-import im.wangchao.mhttp.Response
-import im.wangchao.mhttp.callback.JsonCallbackHandler
-import io.github.wulkanowy.signer.android.signContent
-import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.net.HttpURLConnection
-import java.util.*
-
-open class VulcanApi(open val data: DataVulcan, open val lastSync: Long?) {
-    companion object {
-        const val TAG = "VulcanApi"
-    }
-
-    val profileId
-        get() = data.profile?.id ?: -1
-
-    val profile
-        get() = data.profile
-
-    fun apiGet(
-            tag: String,
-            endpoint: String,
-            method: Int = POST,
-            parameters: Map<String, Any> = emptyMap(),
-            baseUrl: Boolean = false,
-            onSuccess: (json: JsonObject, response: Response?) -> Unit
-    ) {
-        val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
-
-        d(tag, "Request: Vulcan/Api - $url")
-
-        val finalPayload = JsonObject()
-        parameters.map { (name, value) ->
-            when (value) {
-                is JsonObject -> finalPayload.add(name, value)
-                is JsonArray -> finalPayload.add(name, value)
-                is String -> finalPayload.addProperty(name, value)
-                is Int -> finalPayload.addProperty(name, value)
-                is Long -> finalPayload.addProperty(name, value)
-                is Float -> finalPayload.addProperty(name, value)
-                is Char -> finalPayload.addProperty(name, value)
-                is Boolean -> finalPayload.addProperty(name, value)
-            }
-        }
-        finalPayload.addProperty("RemoteMobileTimeKey", System.currentTimeMillis() / 1000)
-        finalPayload.addProperty("TimeKey", System.currentTimeMillis() / 1000 - 1)
-        finalPayload.addProperty("RequestId", UUID.randomUUID().toString())
-        finalPayload.addProperty("RemoteMobileAppVersion", VULCAN_API_APP_VERSION)
-        finalPayload.addProperty("RemoteMobileAppName", VULCAN_API_APP_NAME)
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null && response?.parserErrorBody == null) {
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                if (response?.code() ?: 200 != 200) {
-                    when (response?.code()) {
-                        503 -> ERROR_VULCAN_API_MAINTENANCE
-                        400 -> ERROR_VULCAN_API_BAD_REQUEST
-                        else -> ERROR_VULCAN_API_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(tag, errorCode)
-                                .withResponse(response)
-                                .withApiResponse(json?.toString() ?: response?.parserErrorBody))
-                        return
-                    }
-                }
-
-                if (json == null) {
-                    data.error(ApiError(tag, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                try {
-                    onSuccess(json, response)
-                } catch (e: Exception) {
-                    data.error(ApiError(tag, EXCEPTION_VULCAN_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(VULCAN_API_USER_AGENT)
-                .addHeader("RequestCertificateKey", data.apiFingerprint[data.symbol])
-                .addHeader("RequestSignatureValue",
-                        try {
-                            signContent(
-                                    data.apiPrivateKey[data.symbol] ?: "",
-                                    finalPayload.toString()
-                            )
-                        } catch (e: Exception) {e.printStackTrace();""})
-                .apply {
-                    when (method) {
-                        GET -> get()
-                        POST -> post()
-                    }
-                }
-                .setJsonBody(finalPayload)
-                .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
-                .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
-                .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
-                .callback(callback)
-                .build()
-                .enqueue()
-    }
-}

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

@@ -6,8 +6,9 @@ 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.hebe.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber
+import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.utils.Utils
 
 class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
@@ -15,8 +16,35 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
         private const val TAG = "VulcanData"
     }
 
+    private var firstSemesterSync = false
+    private val firstSemesterSyncExclude = listOf(
+        ENDPOINT_VULCAN_HEBE_MAIN,
+        ENDPOINT_VULCAN_HEBE_PUSH_CONFIG,
+        ENDPOINT_VULCAN_HEBE_ADDRESSBOOK,
+        ENDPOINT_VULCAN_HEBE_TIMETABLE,
+        ENDPOINT_VULCAN_HEBE_EXAMS,
+        ENDPOINT_VULCAN_HEBE_HOMEWORK,
+        ENDPOINT_VULCAN_HEBE_NOTICES,
+        ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX,
+        ENDPOINT_VULCAN_HEBE_MESSAGES_SENT,
+        ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER
+    )
+
     init {
-        nextEndpoint(onSuccess)
+        if (data.studentSemesterNumber == 2 && data.profile?.empty != false) {
+            firstSemesterSync = true
+            // set to sync 1st semester first
+            data.studentSemesterId = data.semester1Id
+            data.studentSemesterNumber = 1
+        }
+        nextEndpoint {
+            if (firstSemesterSync) {
+                // at the end, set back 2nd semester
+                data.studentSemesterId = data.semester2Id
+                data.studentSemesterNumber = 2
+            }
+            onSuccess()
+        }
     }
 
     private fun nextEndpoint(onSuccess: () -> Unit) {
@@ -30,7 +58,21 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
         val id = data.targetEndpointIds.firstKey()
         val lastSync = data.targetEndpointIds.remove(id)
-        useEndpoint(id, lastSync) { endpointId ->
+        useEndpoint(id, lastSync) {
+            if (firstSemesterSync && id !in firstSemesterSyncExclude) {
+                // sync 2nd semester after every endpoint
+                data.studentSemesterId = data.semester2Id
+                data.studentSemesterNumber = 2
+                useEndpoint(id, lastSync) {
+                    // set 1st semester back for the next endpoint
+                    data.studentSemesterId = data.semester1Id
+                    data.studentSemesterNumber = 1
+                    // progress further
+                    data.progress(data.progressStep)
+                    nextEndpoint(onSuccess)
+                }
+                return@useEndpoint
+            }
             data.progress(data.progressStep)
             nextEndpoint(onSuccess)
         }
@@ -39,58 +81,71 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
     private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) {
         Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync")
         when (endpointId) {
-            ENDPOINT_VULCAN_API_UPDATE_SEMESTER -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
-                VulcanApiUpdateSemester(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_PUSH_CONFIG -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_push_config)
-                VulcanApiPushConfig(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_DICTIONARIES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_dictionaries)
-                VulcanApiDictionaries(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_GRADES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_grades)
-                VulcanApiGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_GRADES_SUMMARY -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
-                VulcanApiProposedGrades(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_EVENTS -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_events)
-                VulcanApiEvents(data, isHomework = false, lastSync = lastSync, onSuccess = onSuccess)
-            }
-            ENDPOINT_VULCAN_API_HOMEWORK -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_homework)
-                VulcanApiEvents(data, isHomework = true, lastSync = lastSync, onSuccess = onSuccess)
-            }
-            ENDPOINT_VULCAN_API_NOTICES -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_notices)
-                VulcanApiNotices(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_ATTENDANCE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
-                VulcanApiAttendance(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_TIMETABLE -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
-                VulcanApiTimetable(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
-                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
-                VulcanApiMessagesInbox(data, lastSync, onSuccess)
-            }
-            ENDPOINT_VULCAN_API_MESSAGES_SENT -> {
-                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)
             }
+            ENDPOINT_VULCAN_HEBE_MAIN -> {
+                if (data.profile == null) {
+                    onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
+                    return
+                }
+                data.startProgress(R.string.edziennik_progress_endpoint_student_info)
+                VulcanHebeMain(data, lastSync).getStudents(
+                    profile = data.profile,
+                    profileList = null
+                ) {
+                    onSuccess(ENDPOINT_VULCAN_HEBE_MAIN)
+                }
+            }
+            ENDPOINT_VULCAN_HEBE_PUSH_CONFIG -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_push_config)
+                VulcanHebePushConfig(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_ADDRESSBOOK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_teachers)
+                VulcanHebeAddressbook(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                VulcanHebeTimetable(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_EXAMS -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_exams)
+                VulcanHebeExams(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_GRADES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_grades)
+                VulcanHebeGrades(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
+                VulcanHebeGradeSummary(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_HOMEWORK -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_homework)
+                VulcanHebeHomework(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_NOTICES -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_notices)
+                VulcanHebeNotices(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_ATTENDANCE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_attendance)
+                VulcanHebeAttendance(data, lastSync, onSuccess)
+            }
+            ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
+                VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_RECEIVED)
+            }
+            ENDPOINT_VULCAN_HEBE_MESSAGES_SENT -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
+                VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_SENT)
+            }
+            ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
+                VulcanHebeLuckyNumber(data, lastSync, onSuccess)
+            }
             else -> onSuccess(endpointId)
         }
     }

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

@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data
+
+import android.os.Build
+import androidx.core.util.set
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import im.wangchao.mhttp.Request
+import im.wangchao.mhttp.Response
+import im.wangchao.mhttp.body.MediaTypeUtils
+import im.wangchao.mhttp.callback.JsonCallbackHandler
+import io.github.wulkanowy.signer.hebe.getSignatureHeaders
+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.hebe.HebeFilterType
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.db.entity.LessonRange
+import pl.szczodrzynski.edziennik.data.db.entity.Subject
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.net.HttpURLConnection
+import java.net.URLEncoder
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
+    companion object {
+        const val TAG = "VulcanHebe"
+    }
+
+    val profileId
+        get() = data.profile?.id ?: -1
+
+    val profile
+        get() = data.profile
+
+    fun getDateTime(
+        json: JsonObject?,
+        key: String,
+        default: Long = System.currentTimeMillis()
+    ): Long {
+        val date = json.getJsonObject(key)
+        return date.getLong("Timestamp") ?: return default
+    }
+
+    fun getDate(json: JsonObject?, key: String): Date? {
+        val date = json.getJsonObject(key)
+        return date.getString("Date")?.let { Date.fromY_m_d(it) }
+    }
+
+    fun getTeacherId(json: JsonObject?, key: String): Long? {
+        val teacher = json.getJsonObject(key)
+        val teacherId = teacher.getLong("Id") ?: return null
+        if (data.teacherList[teacherId] == null) {
+            data.teacherList[teacherId] = Teacher(
+                data.profileId,
+                teacherId,
+                teacher.getString("Name") ?: "",
+                teacher.getString("Surname") ?: ""
+            )
+        }
+        return teacherId
+    }
+
+    fun getSubjectId(json: JsonObject?, key: String): Long? {
+        val subject = json.getJsonObject(key)
+        val subjectId = subject.getLong("Id") ?: return null
+        if (data.subjectList[subjectId] == null) {
+            data.subjectList[subjectId] = Subject(
+                data.profileId,
+                subjectId,
+                subject.getString("Name") ?: "",
+                subject.getString("Kod") ?: ""
+            )
+        }
+        return subjectId
+    }
+
+    fun getTeamId(json: JsonObject?, key: String): Long? {
+        val team = json.getJsonObject(key)
+        val teamId = team.getLong("Id") ?: return null
+        if (data.teamList[teamId] == null) {
+            var name = team.getString("Shortcut")
+                ?: team.getString("Name")
+                ?: ""
+            name = "${profile?.studentClassName ?: ""} $name"
+            data.teamList[teamId] = Team(
+                data.profileId,
+                teamId,
+                name,
+                Team.TYPE_VIRTUAL,
+                "${data.schoolCode}:$name",
+                -1
+            )
+        }
+        return teamId
+    }
+
+    fun getClassId(json: JsonObject?, key: String): Long? {
+        val team = json.getJsonObject(key)
+        val teamId = team.getLong("Id") ?: return null
+        if (data.teamList[teamId] == null) {
+            val name = data.profile?.studentClassName
+                ?: team.getString("Name")
+                ?: ""
+            data.teamList[teamId] = Team(
+                data.profileId,
+                teamId,
+                name,
+                Team.TYPE_CLASS,
+                "${data.schoolCode}:$name",
+                -1
+            )
+        }
+        return teamId
+    }
+
+    fun getLessonRange(json: JsonObject?, key: String): LessonRange? {
+        val timeslot = json.getJsonObject(key)
+        val position = timeslot.getInt("Position") ?: return null
+        val start = timeslot.getString("Start") ?: return null
+        val end = timeslot.getString("End") ?: return null
+        val lessonRange = LessonRange(
+            data.profileId,
+            position,
+            Time.fromH_m(start),
+            Time.fromH_m(end)
+        )
+        data.lessonRanges[position] = lessonRange
+        return lessonRange
+    }
+
+    fun getSemester(json: JsonObject?): Int {
+        val periodId = json.getInt("PeriodId") ?: return 1
+        return if (periodId == data.semester1Id)
+            1
+        else
+            2
+    }
+
+    fun isCurrentYear(date: Date): Boolean {
+        return profile?.let { profile ->
+            return@let date >= profile.dateSemester1Start
+        } ?: false
+    }
+
+    fun isCurrentYear(dateTime: Long): Boolean {
+        return profile?.let { profile ->
+            return@let dateTime >= profile.dateSemester1Start.inMillis
+        } ?: false
+    }
+
+    inline fun <reified T> apiRequest(
+        tag: String,
+        endpoint: String,
+        method: Int = GET,
+        payload: JsonElement? = null,
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
+
+        d(tag, "Request: Vulcan/Hebe - $url")
+
+        val privateKey = data.hebePrivateKey
+        val publicHash = data.hebePublicHash
+
+        if (privateKey == null || publicHash == null) {
+            data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            return
+        }
+
+        val timestamp = ZonedDateTime.now(ZoneId.of("GMT"))
+        val timestampMillis = timestamp.toInstant().toEpochMilli()
+        val timestampIso = timestamp.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"))
+
+        val finalPayload = if (payload != null) {
+            JsonObject(
+                "AppName" to VULCAN_HEBE_APP_NAME,
+                "AppVersion" to VULCAN_HEBE_APP_VERSION,
+                "CertificateId" to publicHash,
+                "Envelope" to payload,
+                "FirebaseToken" to (firebaseToken ?: data.app.config.sync.tokenVulcanHebe),
+                "API" to 1,
+                "RequestId" to UUID.randomUUID().toString(),
+                "Timestamp" to timestampMillis,
+                "TimestampFormatted" to timestampIso
+            )
+        } else null
+        val jsonString = finalPayload?.toString()
+
+        val headers = getSignatureHeaders(
+            publicHash,
+            privateKey,
+            jsonString,
+            endpoint,
+            timestamp
+        )
+
+        val callback = object : JsonCallbackHandler() {
+            override fun onSuccess(json: JsonObject?, response: Response?) {
+                if (json == null) {
+                    data.error(
+                        ApiError(TAG, ERROR_RESPONSE_EMPTY)
+                            .withResponse(response)
+                    )
+                    return
+                }
+
+                val status = json.getJsonObject("Status")
+                val statusCode = status?.getInt("Code") ?: 0
+                if (statusCode != 0) {
+                    val statusMessage = status?.getString("Message")
+                    val errorCode = when (statusCode) {
+                        -1 -> ERROR_VULCAN_HEBE_SERVER_ERROR
+                        100 -> ERROR_VULCAN_HEBE_SIGNATURE_ERROR
+                        101 -> ERROR_VULCAN_HEBE_INVALID_PAYLOAD
+                        106 -> ERROR_VULCAN_HEBE_FIREBASE_ERROR
+                        108 -> ERROR_VULCAN_HEBE_CERTIFICATE_GONE
+                        200 -> when (true) {
+                            statusMessage?.contains("Class") -> ERROR_LOGIN_VULCAN_NO_PUPILS
+                            statusMessage?.contains("Token") -> ERROR_LOGIN_VULCAN_INVALID_TOKEN
+                            else -> ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND
+                        }
+                        201 -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN
+                        203 -> when (json.getJsonObject("Envelope").getInt("AvailableRetries")) {
+                            2 -> ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING
+                            1 -> ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING
+                            else -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
+                        }
+                        204 -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
+                        else -> ERROR_VULCAN_HEBE_OTHER
+                    }
+                    data.error(
+                        ApiError(tag, errorCode)
+                            .withResponse(response)
+                            .withApiResponse(json.toString())
+                    )
+                    return
+                }
+
+                val envelope = if (json.get("Envelope").isJsonNull && null is T)
+                    null as T
+                else when (T::class.java) {
+                    JsonObject::class.java -> json.getJsonObject("Envelope") as T
+                    JsonArray::class.java -> json.getJsonArray("Envelope") as T
+                    java.lang.Boolean::class.java -> json.getBoolean("Envelope") as T
+                    else -> {
+                        data.error(
+                            ApiError(tag, ERROR_RESPONSE_EMPTY)
+                                .withResponse(response)
+                                .withApiResponse(json)
+                        )
+                        return
+                    }
+                }
+
+                try {
+                    onSuccess(envelope, response)
+                } catch (e: Exception) {
+                    data.error(
+                        ApiError(tag, EXCEPTION_VULCAN_HEBE_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(VULCAN_HEBE_USER_AGENT)
+            .addHeader("vOS", "Android")
+            .addHeader("vDeviceModel", Build.MODEL)
+            .addHeader("vAPI", "1")
+            .apply {
+                if (data.hebeContext != null)
+                    addHeader("vContext", data.hebeContext)
+                headers.forEach {
+                    addHeader(it.key, it.value)
+                }
+                when (method) {
+                    GET -> get()
+                    POST -> {
+                        post()
+                        setTextBody(jsonString, MediaTypeUtils.APPLICATION_JSON)
+                    }
+                }
+            }
+            .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST)
+            .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN)
+            .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED)
+            .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE)
+            .callback(callback)
+            .build()
+            .enqueue()
+    }
+
+    inline fun <reified T> apiGet(
+        tag: String,
+        endpoint: String,
+        query: Map<String, String> = mapOf(),
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        val queryPath = query.map {
+            it.key + "=" + URLEncoder.encode(it.value, "UTF-8").replace("+", "%20")
+        }.join("&")
+        apiRequest(
+            tag,
+            if (query.isNotEmpty()) "$endpoint?$queryPath" else endpoint,
+            baseUrl = baseUrl,
+            firebaseToken = firebaseToken,
+            onSuccess = onSuccess
+        )
+    }
+
+    inline fun <reified T> apiPost(
+        tag: String,
+        endpoint: String,
+        payload: JsonElement,
+        baseUrl: Boolean = false,
+        firebaseToken: String? = null,
+        crossinline onSuccess: (json: T, response: Response?) -> Unit
+    ) {
+        apiRequest(
+            tag,
+            endpoint,
+            method = POST,
+            payload,
+            baseUrl = baseUrl,
+            firebaseToken = firebaseToken,
+            onSuccess = onSuccess
+        )
+    }
+
+    fun apiGetList(
+        tag: String,
+        endpoint: String,
+        filterType: HebeFilterType? = null,
+        dateFrom: Date? = null,
+        dateTo: Date? = null,
+        lastSync: Long? = null,
+        folder: Int? = null,
+        params: Map<String, String> = mapOf(),
+        includeFilterType: Boolean = true,
+        onSuccess: (data: List<JsonObject>, response: Response?) -> Unit
+    ) {
+        val url = if (includeFilterType && filterType != null)
+            "$endpoint/${filterType.endpoint}"
+        else endpoint
+
+        val query = params.toMutableMap()
+
+        when (filterType) {
+            HebeFilterType.BY_PUPIL -> {
+                query["unitId"] = data.studentUnitId.toString()
+                query["pupilId"] = data.studentId.toString()
+                query["periodId"] = data.studentSemesterId.toString()
+            }
+            HebeFilterType.BY_PERSON -> {
+                query["loginId"] = data.studentLoginId.toString()
+            }
+            HebeFilterType.BY_PERIOD -> {
+                query["periodId"] = data.studentSemesterId.toString()
+                query["pupilId"] = data.studentId.toString()
+            }
+        }
+
+        if (dateFrom != null)
+            query["dateFrom"] = dateFrom.stringY_m_d
+        if (dateTo != null)
+            query["dateTo"] = dateTo.stringY_m_d
+
+        if (folder != null)
+            query["folder"] = folder.toString()
+
+        val semester1Start = profile?.dateSemester1Start?.inMillis
+
+        query["lastId"] = "-2147483648" // don't ask, it's just Vulcan
+        query["pageSize"] = "500"
+        query["lastSyncDate"] = LocalDateTime
+            .ofInstant(
+                Instant.ofEpochMilli(lastSync ?: semester1Start ?: 0),
+                ZoneId.systemDefault()
+            )
+            .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+
+        apiGet(tag, url, query) { json: JsonArray, response ->
+            onSuccess(json.map { it.asJsonObject }, response)
+        }
+    }
+}

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

@@ -11,12 +11,11 @@ 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.*
 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
@@ -83,10 +82,12 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                     onResult(symbol, STATE_NO_REGISTER)
                     return
                 }
-                if (!validateCallback(text, response, jsonResponse = false)) {
+                if (!validateCallback(symbol, text, response, jsonResponse = false)) {
                     return
                 }
-                data.webExpiryTime = Date.fromIso(certificate.expiryDate) / 1000L
+                data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map ->
+                    map[symbol] = (Date.fromIso(certificate.expiryDate) / 1000L).toString()
+                }
                 onResult(symbol, STATE_SUCCESS)
             }
 
@@ -120,7 +121,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
     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) {
+                if (!validateCallback(symbol, text, response, jsonResponse = false) || text == null) {
                     return
                 }
 
@@ -136,7 +137,30 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                     }
                 }
 
-                data.webPermissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] }
+                data.webPermissions = data.webPermissions.toMutableMap().also { map ->
+                    val permissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] }
+                    if (permissions?.isNotBlank() == true) {
+                        val studentId = permissions.split("|")
+                            .getOrNull(0)
+                            ?.base64DecodeToString()
+                            ?.toJsonObject()
+                            ?.getJsonArray("AuthInfos")
+                            ?.asJsonObjectList()
+                            ?.flatMap { authInfo ->
+                                authInfo.getJsonArray("UczenIds")
+                                    ?.map { it.asInt }
+                                    ?: listOf()
+                            }
+                            ?.firstOrNull()
+                            ?.toString()
+                        data.app.cookieJar.set(
+                            data.webHost ?: "vulcan.net.pl",
+                            "idBiezacyUczen",
+                            studentId
+                        )
+                    }
+                    map[symbol] = permissions
+                }
 
                 val schoolSymbols = mutableListOf<String>()
                 val clientUrl = "://uonetplus-uczen.${data.webHost}/$symbol/"
@@ -144,7 +168,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                 var count = 0
                 while (clientIndex != -1 && count < 100) {
                     val startIndex = clientIndex + clientUrl.length
-                    val endIndex = text.indexOf('/', startIndex = startIndex)
+                    val endIndex = text.indexOfAny(charArrayOf('"', '/'), startIndex = startIndex)
                     val schoolSymbol = text.substring(startIndex, endIndex)
                     schoolSymbols += schoolSymbol
                     clientIndex = text.indexOf(clientUrl, startIndex = endIndex)
@@ -186,7 +210,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                 .enqueue()
     }
 
-    private fun validateCallback(text: String?, response: Response?, jsonResponse: Boolean = true): Boolean {
+    private fun validateCallback(symbol: String, text: String?, response: Response?, jsonResponse: Boolean = true): Boolean {
         if (text == null) {
             data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
                     .withResponse(response))
@@ -207,11 +231,13 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
 
         val cookies = data.app.cookieJar.getAll(data.webHost ?: "vulcan.net.pl")
         val authCookie = cookies["EfebSsoAuthCookie"]
-        if ((authCookie == null || authCookie == "null") && data.webAuthCookie != null) {
+        if ((authCookie == null || authCookie == "null") && data.webAuthCookie[symbol] != null) {
-            data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie)
+            data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie[symbol])
         }
-        else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie) {
+        else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie[symbol]) {
-            data.webAuthCookie = authCookie
+            data.webAuthCookie = data.webAuthCookie.toMutableMap().also { map ->
+                map[symbol] = authCookie
+            }
         }
         return true
     }
@@ -250,7 +276,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
 
         val callback = object : TextCallbackHandler() {
             override fun onSuccess(text: String?, response: Response?) {
-                if (!validateCallback(text, response))
+                if (!validateCallback(data.symbol ?: "default", text, response))
                     return
 
                 try {

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

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

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

@@ -1,110 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.isEmpty
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_ATTENDANCE
-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
-
-class VulcanApiAttendance(override val data: DataVulcan,
-                          override val lastSync: Long?,
-                          val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiAttendance"
-    }
-
-    init { data.profile?.also { profile ->
-        if (data.attendanceTypes.isEmpty()) {
-            data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id }
-        }
-
-        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 semesterId
-        )) { json, _ ->
-            json.getJsonObject("Data")?.getJsonArray("Frekwencje")?.forEach { attendanceEl ->
-                val attendance = attendanceEl.asJsonObject
-
-                val type = data.attendanceTypes.get(attendance.getLong("IdKategoria") ?: return@forEach)
-                        ?: return@forEach
-
-                val id = (attendance.getInt("Dzien") ?: 0) + (attendance.getInt("Numer") ?: 0)
-
-                val lessonDateMillis = Date.fromY_m_d(attendance.getString("DzienTekst")).inMillis
-                val lessonDate = Date.fromMillis(lessonDateMillis)
-                val startTime = data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime
-
-                val lessonSemester = semesterNumber
-
-                val attendanceObject = Attendance(
-                        profileId = profileId,
-                        id = id.toLong(),
-                        baseType = type.baseType,
-                        typeName = type.typeName,
-                        typeShort = type.typeShort,
-                        typeSymbol = type.typeSymbol,
-                        typeColor = type.typeColor,
-                        date = lessonDate,
-                        startTime = startTime,
-                        semester = lessonSemester,
-                        teacherId = -1,
-                        subjectId = attendance.getLong("IdPrzedmiot") ?: -1,
-                        addedDate = lessonDate.combineWith(startTime)
-                ).also {
-                    it.lessonNumber = attendance.getInt("Numer")
-                    it.isCounted = it.baseType != Attendance.TYPE_RELEASED
-                }
-
-                data.attendanceList.add(attendanceObject)
-                if (type.baseType != TYPE_PRESENT) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_ATTENDANCE,
-                            attendanceObject.id,
-                            profile.empty || type.baseType == Attendance.TYPE_PRESENT_CUSTOM || type.baseType == Attendance.TYPE_UNKNOWN,
-                            profile.empty || type.baseType == Attendance.TYPE_PRESENT_CUSTOM || type.baseType == Attendance.TYPE_UNKNOWN
-                    ))
-                }
-            }
-
-            onSuccess()
-        }
-    }
-}

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

@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_DICTIONARIES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_DICTIONARIES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.utils.models.Time
-
-class VulcanApiDictionaries(override val data: DataVulcan,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiDictionaries"
-    }
-
-    init {
-        apiGet(TAG, VULCAN_API_ENDPOINT_DICTIONARIES) { json, _ ->
-            val elements = json.getJsonObject("Data")
-
-            elements?.getJsonArray("Pracownicy")?.forEach { saveTeacher(it.asJsonObject) }
-            elements?.getJsonArray("Przedmioty")?.forEach { saveSubject(it.asJsonObject) }
-            elements?.getJsonArray("PoryLekcji")?.forEach { saveLessonRange(it.asJsonObject) }
-            elements?.getJsonArray("KategorieOcen")?.forEach { saveGradeCategory(it.asJsonObject) }
-            elements?.getJsonArray("KategorieUwag")?.forEach { saveNoticeType(it.asJsonObject) }
-            elements?.getJsonArray("KategorieFrekwencji")?.forEach { saveAttendanceType(it.asJsonObject) }
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4 * DAY)
-            onSuccess(ENDPOINT_VULCAN_API_DICTIONARIES)
-        }
-    }
-
-    private fun saveTeacher(teacher: JsonObject) {
-        val id = teacher.getLong("Id") ?: return
-        val name = teacher.getString("Imie") ?: ""
-        val surname = teacher.getString("Nazwisko") ?: ""
-        val loginId = teacher.getString("LoginId") ?: "-1"
-
-        val teacherObject = Teacher(
-                profileId,
-                id,
-                name,
-                surname,
-                loginId
-        )
-
-        data.teacherList.put(id, teacherObject)
-    }
-
-    private fun saveSubject(subject: JsonObject) {
-        val id = subject.getLong("Id") ?: return
-        val longName = subject.getString("Nazwa") ?: ""
-        val shortName = subject.getString("Kod") ?: ""
-
-        val subjectObject = Subject(
-                profileId,
-                id,
-                longName,
-                shortName
-        )
-
-        data.subjectList.put(id, subjectObject)
-    }
-
-    private fun saveLessonRange(lessonRange: JsonObject) {
-        val lessonNumber = lessonRange.getInt("Numer") ?: return
-        val startTime = lessonRange.getString("PoczatekTekst")?.let { Time.fromH_m(it) } ?: return
-        val endTime = lessonRange.getString("KoniecTekst")?.let { Time.fromH_m(it) } ?: return
-
-        val lessonRangeObject = LessonRange(
-                profileId,
-                lessonNumber,
-                startTime,
-                endTime
-        )
-
-        data.lessonRanges.put(lessonNumber, lessonRangeObject)
-    }
-
-    private fun saveGradeCategory(gradeCategory: JsonObject) {
-        val id = gradeCategory.getLong("Id") ?: return
-        val name = gradeCategory.getString("Nazwa") ?: ""
-
-        val gradeCategoryObject = GradeCategory(
-                profileId,
-                id,
-                0.0f,
-                -1,
-                name
-        )
-
-        data.gradeCategories.put(id, gradeCategoryObject)
-    }
-
-    private fun saveNoticeType(noticeType: JsonObject) {
-        val id = noticeType.getLong("Id") ?: return
-        val name = noticeType.getString("Nazwa") ?: ""
-
-        val noticeTypeObject = NoticeType(
-                profileId,
-                id,
-                name
-        )
-
-        data.noticeTypes.put(id, noticeTypeObject)
-    }
-
-    private fun saveAttendanceType(attendanceType: JsonObject) {
-        val id = attendanceType.getLong("Id") ?: return
-        val typeName = attendanceType.getString("Nazwa") ?: ""
-
-        val absent = attendanceType.getBoolean("Nieobecnosc") ?: false
-        val excused = attendanceType.getBoolean("Usprawiedliwione") ?: false
-        val baseType = if (absent) {
-            if (excused)
-                Attendance.TYPE_ABSENT_EXCUSED
-            else
-                Attendance.TYPE_ABSENT
-        } else {
-            val belated = attendanceType.getBoolean("Spoznienie") ?: false
-            val released = attendanceType.getBoolean("Zwolnienie") ?: false
-            val present = attendanceType.getBoolean("Obecnosc") ?: true
-            if (belated)
-                if (excused)
-                    Attendance.TYPE_BELATED_EXCUSED
-                else
-                    Attendance.TYPE_BELATED
-            else if (released)
-                Attendance.TYPE_RELEASED
-            else if (present)
-                Attendance.TYPE_PRESENT
-            else
-                Attendance.TYPE_UNKNOWN
-        }
-
-        val (typeColor, typeSymbol) = when (id.toInt()) {
-            1 -> 0xffffffff to "●"  // obecność
-            2 -> 0xffffa687 to "—"  // nieobecność
-            3 -> 0xfffcc150 to "u"  // nieobecność usprawiedliwiona
-            4 -> 0xffede049 to "s"  // spóźnienie
-            5 -> 0xffbbdd5f to "su" // spóźnienie usprawiedliwione
-            6 -> 0xffa9c9fd to "ns" // nieobecny z przyczyn szkolnych
-            7 -> 0xffddbbe5 to "z"  // zwolniony
-            8 -> 0xffffffff to ""   // usunięty wpis
-            else -> null to "?"
-        }
-
-        val typeShort = when (id.toInt()) {
-            6 -> "ns" // nieobecny z przyczyn szkolnych
-            8 -> ""   // usunięty wpis
-            else -> data.app.attendanceManager.getTypeShort(baseType)
-        }
-
-        val attendanceTypeObject = AttendanceType(
-                profileId,
-                id,
-                baseType,
-                typeName,
-                typeShort,
-                typeSymbol,
-                typeColor?.toInt()
-        )
-
-        data.attendanceTypes.put(id, attendanceTypeObject)
-    }
-}

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

@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_EVENTS
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_HOMEWORK
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_EVENTS
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_HOMEWORK
-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
-import pl.szczodrzynski.edziennik.getLong
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiEvents(override val data: DataVulcan,
-                      override val lastSync: Long?,
-                      private val isHomework: Boolean,
-                      val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiEvents"
-    }
-
-    init { data.profile?.also { profile ->
-
-        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 = profile.getSemesterEnd(semesterNumber).stringY_m_d
-
-        val endpoint = when (isHomework) {
-            true -> VULCAN_API_ENDPOINT_HOMEWORK
-            else -> VULCAN_API_ENDPOINT_EVENTS
-        }
-        apiGet(TAG, endpoint, parameters = mapOf(
-                "DataPoczatkowa" to startDate,
-                "DataKoncowa" to endDate,
-                "IdOddzial" to data.studentClassId,
-                "IdUczen" to data.studentId,
-                "IdOkresKlasyfikacyjny" to semesterId
-        )) { json, _ ->
-            val events = json.getJsonArray("Data")
-
-            events?.forEach { eventEl ->
-                val event = eventEl.asJsonObject
-
-                val id = event?.getLong("Id") ?: return@forEach
-                val eventDate = Date.fromY_m_d(event.getString("DataTekst") ?: return@forEach)
-                val subjectId = event.getLong("IdPrzedmiot") ?: -1
-                val teacherId = event.getLong("IdPracownik") ?: -1
-                val topic = event.getString("Opis")?.trim() ?: ""
-
-                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
-                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
-
-                val type = when (isHomework) {
-                    true -> Event.TYPE_HOMEWORK
-                    else -> when (event.getBoolean("Rodzaj")) {
-                        false -> Event.TYPE_SHORT_QUIZ
-                        else -> Event.TYPE_EXAM
-                    }
-                }
-                val teamId = event.getLong("IdOddzial") ?: data.teamClass?.id ?: -1
-
-                val eventObject = Event(
-                        profileId = profileId,
-                        id = id,
-                        date = eventDate,
-                        time = startTime,
-                        topic = topic,
-                        color = null,
-                        type = type,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        teamId = teamId
-                )
-
-                data.eventList.add(eventObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        if (isHomework) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}

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

@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-19
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES
-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.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
-
-class VulcanApiGrades(override val data: DataVulcan,
-                      override val lastSync: Long?,
-                      val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiGrades"
-    }
-
-    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 semesterId
-        )) { json, _ ->
-            val grades = json.getJsonArray("Data")
-
-            grades?.forEach { gradeEl ->
-                val grade = gradeEl.asJsonObject
-
-                val id = grade.getLong("Id") ?: return@forEach
-                val categoryId = grade.getLong("IdKategoria") ?: -1
-                val category = data.gradeCategories.singleOrNull{ it.categoryId == categoryId }?.text
-                        ?: ""
-                val teacherId = grade.getLong("IdPracownikD") ?: -1
-                val subjectId = grade.getLong("IdPrzedmiot") ?: -1
-                val description = grade.getString("Opis")
-                val comment = grade.getString("Komentarz")
-                var value = grade.getFloat("Wartosc")
-                var weight = grade.getFloat("WagaOceny") ?: 0.0f
-                val modificatorValue = grade.getFloat("WagaModyfikatora")
-                val numerator = grade.getFloat("Licznik")
-                val denominator = grade.getFloat("Mianownik")
-                val addedDate = (grade.getLong("DataModyfikacji") ?: return@forEach) * 1000
-
-                var finalDescription = ""
-
-                var name = when (numerator != null && denominator != null) {
-                    true -> {
-                        value = numerator / denominator
-                        finalDescription += DecimalFormat("#.##").format(numerator) +
-                                "/" + DecimalFormat("#.##").format(denominator)
-                        weight = 0.0f
-                        (value * 100).roundToInt().toString() + "%"
-                    }
-                    else -> {
-                        if (value != null) modificatorValue?.also { value += it }
-                        else weight = 0.0f
-
-                        grade.getString("Wpis") ?: ""
-                    }
-                }
-
-                comment?.also {
-                    if (name == "") name = it
-                    else finalDescription = (if (finalDescription == "") "" else " ") + it
-                }
-
-                description?.also {
-                    finalDescription = (if (finalDescription == "") "" else " - ") + it
-                }
-
-                val color = when (name) {
-                    "1-", "1", "1+" -> 0xffd65757
-                    "2-", "2", "2+" -> 0xff9071b3
-                    "3-", "3", "3+" -> 0xffd2ab24
-                    "4-", "4", "4+" -> 0xff50b6d6
-                    "5-", "5", "5+" -> 0xff2cbd92
-                    "6-", "6", "6+" -> 0xff91b43c
-                    else -> 0xff3D5F9C
-                }.toInt()
-
-                val gradeObject = Grade(
-                        profileId = profileId,
-                        id = id,
-                        name = name,
-                        type = TYPE_NORMAL,
-                        value = value ?: 0.0f,
-                        weight = weight,
-                        color = color,
-                        category = category,
-                        description = finalDescription,
-                        comment = null,
-                        semester = semesterNumber,
-                        teacherId = teacherId,
-                        subjectId = subjectId,
-                        addedDate = addedDate
-                )
-
-                data.gradeList.add(gradeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_GRADE,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}

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

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-01
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_RECEIVED
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.text.replace
-
-class VulcanApiMessagesInbox(override val data: DataVulcan,
-                             override val lastSync: Long?,
-                             val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiMessagesInbox"
-    }
-
-    init {
-        data.profile?.also { profile ->
-
-            val startDate = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).inUnix
-                else -> Date.getToday().stepForward(0, -2, 0).inUnix
-            }
-            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-
-                    val senderLoginId = message.getString("NadawcaId") ?: return@forEach
-                    val senderId = data.teacherList.singleOrNull { it.loginId == senderLoginId }?.id ?: {
-
-                        val senderName = message.getString("Nadawca") ?: ""
-
-                        senderName.splitName()?.let { (senderLastName, senderFirstName) ->
-                            val teacherObject = Teacher(
-                                    profileId,
-                                    -1 * Utils.crc16(senderName.toByteArray()).toLong(),
-                                    senderFirstName,
-                                    senderLastName,
-                                    senderLoginId
-                            )
-                            data.teacherList.put(teacherObject.id, teacherObject)
-                            teacherObject.id
-                        }
-                    }.invoke()
-
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-                    val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 }
-                            ?: -1
-
-                    val messageObject = Message(
-                            profileId = profileId,
-                            id = id,
-                            type = TYPE_RECEIVED,
-                            subject = subject,
-                            body = body.replace("\n", "<br>"),
-                            senderId = senderId,
-                            addedDate = sentDate
-                    )
-
-                    val messageRecipientObject = MessageRecipient(
-                            profileId,
-                            -1,
-                            -1,
-                            readDate,
-                            id
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.messageRecipientList.add(messageRecipientObject)
-                    data.setSeenMetadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            readDate > 0,
-                            readDate > 0
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS)
-                onSuccess(ENDPOINT_VULCAN_API_MESSAGES_INBOX)
-            }
-        } ?: onSuccess(ENDPOINT_VULCAN_API_MESSAGES_INBOX)
-    }
-}

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

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-5
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
-import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.models.Date
-import kotlin.text.replace
-
-class VulcanApiMessagesSent(override val data: DataVulcan,
-                            override val lastSync: Long?,
-                            val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiMessagesSent"
-    }
-
-    init {
-        data.profile?.also { profile ->
-
-            val startDate = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).inUnix
-                else -> Date.getToday().stepForward(0, -2, 0).inUnix
-            }
-            val endDate = Date.getToday().stepForward(0, 1, 0).inUnix
-
-            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
-                    "DataPoczatkowa" to startDate,
-                    "DataKoncowa" to endDate,
-                    "LoginId" to data.studentLoginId,
-                    "IdUczen" to data.studentId
-            )) { json, _ ->
-                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message ->
-                    val id = message.getLong("WiadomoscId") ?: return@forEach
-                    val subject = message.getString("Tytul") ?: ""
-                    val body = message.getString("Tresc") ?: ""
-                    val readBy = message.getInt("Przeczytane") ?: 0
-                    val unreadBy = message.getInt("Nieprzeczytane") ?: 0
-                    val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
-
-                    message.getJsonArray("Adresaci")?.asJsonObjectList()
-                            ?.onEach { receiver ->
-
-                                val receiverLoginId = receiver.getString("LoginId")
-                                        ?: return@onEach
-                                val receiverId = data.teacherList.singleOrNull { it.loginId == receiverLoginId }?.id
-                                        ?: {
-                                            val receiverName = receiver.getString("Nazwa") ?: ""
-
-                                            receiverName.splitName()?.let { (receiverLastName, receiverFirstName) ->
-                                                val teacherObject = Teacher(
-                                                        profileId,
-                                                        -1 * Utils.crc16(receiverName.toByteArray()).toLong(),
-                                                        receiverFirstName,
-                                                        receiverLastName,
-                                                        receiverLoginId
-                                                )
-                                                data.teacherList.put(teacherObject.id, teacherObject)
-                                                teacherObject.id
-                                            }
-                                        }.invoke() ?: -1
-
-                                val readDate: Long = when (readBy) {
-                                    0 -> 0
-                                    else -> when (unreadBy) {
-                                        0 -> 1
-                                        else -> -1
-                                    }
-                                }
-
-                                val messageRecipientObject = MessageRecipient(
-                                        profileId,
-                                        receiverId,
-                                        -1,
-                                        readDate,
-                                        id
-                                )
-
-                                data.messageRecipientList.add(messageRecipientObject)
-                            }
-
-                    val messageObject = Message(
-                            profileId = profileId,
-                            id = id,
-                            type = TYPE_SENT,
-                            subject = subject,
-                            body = body.replace("\n", "<br>"),
-                            senderId = null,
-                            addedDate = sentDate
-                    )
-
-                    data.messageList.add(messageObject)
-                    data.setSeenMetadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_MESSAGE,
-                            id,
-                            true,
-                            true
-                    ))
-                }
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_SENT, 1 * DAY, DRAWER_ITEM_MESSAGES)
-                onSuccess(ENDPOINT_VULCAN_API_MESSAGES_SENT)
-            }
-        }
-    }
-}

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

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-23
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.isEmpty
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_NOTICES
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_NOTICES
-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
-import pl.szczodrzynski.edziennik.getString
-import pl.szczodrzynski.edziennik.toSparseArray
-
-class VulcanApiNotices(override val data: DataVulcan,
-                       override val lastSync: Long?,
-                       val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiNotices"
-    }
-
-    init { data.profile?.also { profile ->
-        if (data.noticeTypes.isEmpty()) {
-            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
-        )) { json, _ ->
-            json.getJsonArray("Data")?.forEach { noticeEl ->
-                val notice = noticeEl.asJsonObject
-
-                val id = notice.getLong("Id") ?: return@forEach
-                val text = notice.getString("TrescUwagi") ?: return@forEach
-                val teacherId = notice.getLong("IdPracownik") ?: -1
-                val addedDate = notice.getLong("DataModyfikacji")?.times(1000) ?: System.currentTimeMillis()
-
-                val categoryId = notice.getLong("IdKategoriaUwag") ?: -1
-                val categoryText = data.noticeTypes[categoryId]?.name ?: ""
-
-                val noticeObject = Notice(
-                        profileId = profileId,
-                        id = id,
-                        type = Notice.TYPE_NEUTRAL,
-                        semester = profile.currentSemester,
-                        text = text,
-                        category = categoryText,
-                        points = null,
-                        teacherId = teacherId,
-                        addedDate = addedDate
-                )
-
-                data.noticeList.add(noticeObject)
-                data.metadataList.add(Metadata(
-                        profileId,
-                        Metadata.TYPE_NOTICE,
-                        id,
-                        profile.empty,
-                        profile.empty
-                ))
-            }
-
-            onSuccess()
-        }
-    }
-}

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

@@ -1,112 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import com.google.gson.JsonArray
-import pl.szczodrzynski.edziennik.HOUR
-import pl.szczodrzynski.edziennik.asJsonObjectList
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES_SUMMARY
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-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.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
-
-class VulcanApiProposedGrades(override val data: DataVulcan,
-                              override val lastSync: Long?,
-                              val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiProposedGrades"
-    }
-
-    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 semesterId
-        )) { json, _ ->
-            val grades = json.getJsonObject("Data")
-
-            grades.getJsonArray("OcenyPrzewidywane")?.let {
-                processGradeList(it, semesterNumber, isFinal = false)
-            }
-
-            grades.getJsonArray("OcenyKlasyfikacyjne")?.let {
-                processGradeList(it, semesterNumber, isFinal = true)
-            }
-
-            onSuccess()
-        }
-    }
-
-    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 - semesterNumber
-
-            val color = Utils.getVulcanGradeColor(name)
-
-            val gradeObject = Grade(
-                    profileId = profileId,
-                    id = id,
-                    name = name,
-                    type = if (semesterNumber == 1) {
-                        if (isFinal) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER1_PROPOSED
-                    } else {
-                        if (isFinal) TYPE_SEMESTER2_FINAL else TYPE_SEMESTER2_PROPOSED
-                    },
-                    value = value,
-                    weight = 0f,
-                    color = color,
-                    category = "",
-                    description = null,
-                    comment = null,
-                    semester = semesterNumber,
-                    teacherId = -1,
-                    subjectId = subjectId
-            )
-
-            data.gradeList.add(gradeObject)
-            data.metadataList.add(Metadata(
-                    profileId,
-                    Metadata.TYPE_GRADE,
-                    gradeObject.id,
-                    data.profile?.empty ?: false,
-                    data.profile?.empty ?: false
-            ))
-        }
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-2-20.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_PUSH
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_PUSH_CONFIG
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
-
-class VulcanApiPushConfig(override val data: DataVulcan,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiPushConfig"
-    }
-
-    init { data.app.config.sync.tokenVulcan?.also { tokenVulcan ->
-        apiGet(TAG, VULCAN_API_ENDPOINT_PUSH, parameters = mapOf(
-                "Token" to tokenVulcan,
-                "IdUczen" to data.studentId,
-                "PushOcena" to true,
-                "PushFrekwencja" to true,
-                "PushUwaga" to true,
-                "PushWiadomosc" to true
-        )) { _, _ ->
-            // sync always: this endpoint has .shouldSync set
-            data.setSyncNext(ENDPOINT_VULCAN_API_PUSH_CONFIG, SYNC_ALWAYS)
-            data.app.config.sync.tokenVulcanList =
-                    data.app.config.sync.tokenVulcanList + profileId
-            onSuccess(ENDPOINT_VULCAN_API_PUSH_CONFIG)
-        }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_PUSH_CONFIG) }
-}

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

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

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

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-10-20
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-
-class VulcanApiTemplate(override val data: DataVulcan,
-                        override val lastSync: Long?,
-                        val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApi"
-    }
-
-    init {
-        /* data.profile?.also { profile ->
-            apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ ->
-
-                data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS)
-                onSuccess()
-            }
-        } */
-    }
-}

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

@@ -1,216 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-13
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import androidx.core.util.set
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.Regexes.VULCAN_SHIFT_ANNOTATION
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_TIMETABLE
-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.*
-import pl.szczodrzynski.edziennik.utils.Utils.crc16
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.models.Date
-import pl.szczodrzynski.edziennik.utils.models.Week
-
-class VulcanApiTimetable(override val data: DataVulcan,
-                         override val lastSync: Long?,
-                         val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiTimetable"
-    }
-
-    init { data.profile?.also { profile ->
-        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)
-
-        apiGet(TAG, VULCAN_API_ENDPOINT_TIMETABLE, parameters = mapOf(
-                "DataPoczatkowa" to weekStart.stringY_m_d,
-                "DataKoncowa" to weekEnd.stringY_m_d,
-                "IdUczen" to data.studentId,
-                "IdOddzial" to data.studentClassId,
-                "IdOkresKlasyfikacyjny" to data.studentSemesterId
-        )) { json, _ ->
-            val dates = mutableSetOf<Int>()
-            val lessons = mutableListOf<Lesson>()
-
-            json.getJsonArray("Data")?.asJsonObjectList()?.forEach { lesson ->
-                if (lesson.getBoolean("PlanUcznia") != true)
-                    return@forEach
-                val lessonDate = Date.fromY_m_d(lesson.getString("DzienTekst"))
-                val lessonNumber = lesson.getInt("NumerLekcji")
-                val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }
-                val startTime = lessonRange?.startTime
-                val endTime = lessonRange?.endTime
-                val teacherId = lesson.getLong("IdPracownik")
-                val classroom = lesson.getString("Sala")
-
-                val oldTeacherId = lesson.getLong("IdPracownikOld")
-
-                val changeAnnotation = lesson.getString("AdnotacjaOZmianie") ?: ""
-                val type = when {
-                    changeAnnotation.startsWith("(przeniesiona z") -> Lesson.TYPE_SHIFTED_TARGET
-                    changeAnnotation.startsWith("(przeniesiona na") -> Lesson.TYPE_SHIFTED_SOURCE
-                    changeAnnotation.startsWith("(zastępstwo") -> Lesson.TYPE_CHANGE
-                    lesson.getBoolean("PrzekreslonaNazwa") == true -> Lesson.TYPE_CANCELLED
-                    else -> Lesson.TYPE_NORMAL
-                }
-
-                val teamId = lesson.getString("PodzialSkrot")?.let { teamName ->
-                    val name = "${data.teamClass?.name} $teamName"
-                    val id = name.crc16().toLong()
-                    var team = data.teamList.singleOrNull { it.name == name }
-                    if (team == null) {
-                        team = Team(
-                                profileId,
-                                id,
-                                name,
-                                Team.TYPE_VIRTUAL,
-                                "${data.schoolCode}:$name",
-                                teacherId ?: oldTeacherId ?: -1
-                        )
-                        data.teamList[id] = team
-                    }
-                    team.id
-                } ?: data.teamClass?.id ?: -1
-
-                val subjectId = lesson.getLong("IdPrzedmiot").let { id ->
-                    // get the specified subject name
-                    val subjectName = lesson.getString("PrzedmiotNazwa") ?: ""
-
-                    val condition = when (id) {
-                        // "special" subject - e.g. one time classes, a trip, etc.
-                        0L -> { subject: Subject -> subject.longName == subjectName }
-                        // normal subject, check if it exists
-                        else -> { subject: Subject -> subject.id == id }
-                    }
-
-                    data.subjectList.singleOrNull(condition)?.id ?: {
-                        /**
-                         * CREATE A NEW SUBJECT IF IT DOESN'T EXIST
-                         */
-
-                        val subjectObject = Subject(
-                                profileId,
-                                if (id == null || id == 0L)
-                                    -1 * crc16(subjectName.toByteArray()).toLong()
-                                else
-                                    id,
-                                subjectName,
-                                subjectName
-                        )
-                        data.subjectList.put(subjectObject.id, subjectObject)
-                        subjectObject.id
-                    }()
-                }
-
-                val lessonObject = Lesson(profileId, -1).apply {
-                    this.type = type
-
-                    when (type) {
-                        Lesson.TYPE_NORMAL, Lesson.TYPE_CHANGE, Lesson.TYPE_SHIFTED_TARGET -> {
-                            this.date = lessonDate
-                            this.lessonNumber = lessonNumber
-                            this.startTime = startTime
-                            this.endTime = endTime
-                            this.subjectId = subjectId
-                            this.teacherId = teacherId
-                            this.teamId = teamId
-                            this.classroom = classroom
-
-                            this.oldTeacherId = oldTeacherId
-                        }
-
-                        Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> {
-                            this.oldDate = lessonDate
-                            this.oldLessonNumber = lessonNumber
-                            this.oldStartTime = startTime
-                            this.oldEndTime = endTime
-                            this.oldSubjectId = subjectId
-                            this.oldTeacherId = teacherId
-                            this.oldTeamId = teamId
-                            this.oldClassroom = classroom
-                        }
-                    }
-
-                    if (type == Lesson.TYPE_SHIFTED_SOURCE || type == Lesson.TYPE_SHIFTED_TARGET) {
-                        val shift = VULCAN_SHIFT_ANNOTATION.find(changeAnnotation)
-                        val oldLessonNumber = shift?.get(2)?.toInt()
-                        val oldLessonDate = shift?.get(3)?.let { Date.fromd_m_Y(it) }
-
-                        val oldLessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == oldLessonNumber }
-                        val oldStartTime = oldLessonRange?.startTime
-                        val oldEndTime = oldLessonRange?.endTime
-
-                        when (type) {
-                            Lesson.TYPE_SHIFTED_SOURCE -> {
-                                this.lessonNumber = oldLessonNumber
-                                this.date = oldLessonDate
-                                this.startTime = oldStartTime
-                                this.endTime = oldEndTime
-                            }
-
-                            Lesson.TYPE_SHIFTED_TARGET -> {
-                                this.oldLessonNumber = oldLessonNumber
-                                this.oldDate = oldLessonDate
-                                this.oldStartTime = oldStartTime
-                                this.oldEndTime = oldEndTime
-                            }
-                        }
-                    }
-
-                    this.id = buildId()
-                }
-
-                val seen = profile.empty || lessonDate < Date.getToday()
-
-                if (type != Lesson.TYPE_NORMAL) {
-                    data.metadataList.add(Metadata(
-                            profileId,
-                            Metadata.TYPE_LESSON_CHANGE,
-                            lessonObject.id,
-                            seen,
-                            seen
-                    ))
-                }
-
-                dates.add(lessonDate.value)
-                lessons.add(lessonObject)
-            }
-
-            val date: Date = weekStart.clone()
-            while (date <= weekEnd) {
-                if (!dates.contains(date.value)) {
-                    lessons.add(Lesson(profileId, date.value.toLong()).apply {
-                        this.type = Lesson.TYPE_NO_LESSONS
-                        this.date = date.clone()
-                    })
-                }
-
-                date.stepForward(0, 0, 1)
-            }
-
-            d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
-
-            data.lessonList.addAll(lessons)
-            data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_TIMETABLE, SYNC_ALWAYS)
-            onSuccess(ENDPOINT_VULCAN_API_TIMETABLE)
-        }
-    }}
-}

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

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-2-1.
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
-
-import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_STUDENT_LIST
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_UPDATE_SEMESTER
-import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi
-import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class VulcanApiUpdateSemester(override val data: DataVulcan,
-                              override val lastSync: Long?,
-                              val onSuccess: (endpointId: Int) -> Unit
-) : VulcanApi(data, lastSync) {
-    companion object {
-        const val TAG = "VulcanApiUpdateSemester"
-    }
-
-    init { data.profile?.also { profile ->
-        apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response ->
-            val students = json.getJsonArray("Data")
-
-            if (students == null || students.isEmpty()) {
-                data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT)
-                        .withResponse(response)
-                        .withApiResponse(json))
-                return@apiGet
-            }
-
-            students.asJsonObjectList().firstOrNull {
-                it.getInt("Id") == data.studentId
-            }?.let { student ->
-                val studentClassId = student.getInt("IdOddzial") ?: return@let
-                val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@let)
-                val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@let
-
-                val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@let
-                val currentSemesterEndDate = (student.getLong("OkresDataDo") ?: return@let) + 86400
-                val studentSemesterNumber = student.getInt("OkresNumer") ?: return@let
-
-                var dateSemester1Start: Date? = null
-                var dateSemester2Start: Date? = null
-                var dateYearEnd: Date? = null
-                when (studentSemesterNumber) {
-                    1 -> {
-                        dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                        dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
-                    }
-                    2 -> {
-                        dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                        dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
-                    }
-                }
-
-                data.studentClassId = studentClassId
-                data.studentSemesterId = studentSemesterId
-                data.studentSemesterNumber = studentSemesterNumber
-                data.profile.studentData["semester${studentSemesterNumber}Id"] = studentSemesterId
-                data.currentSemesterEndDate = currentSemesterEndDate
-                profile.studentClassName = studentClassName
-                dateSemester1Start?.let {
-                    profile.dateSemester1Start = it
-                    profile.studentSchoolYearStart = it.year
-                }
-                dateSemester2Start?.let { profile.dateSemester2Start = it }
-                dateYearEnd?.let { profile.dateYearEnd = it }
-            }
-
-            data.setSyncNext(ENDPOINT_VULCAN_API_UPDATE_SEMESTER, if (data.studentSemesterNumber == 2) 7*DAY else 2*DAY)
-            onSuccess(ENDPOINT_VULCAN_API_UPDATE_SEMESTER)
-        }
-    } ?: onSuccess(ENDPOINT_VULCAN_API_UPDATE_SEMESTER) }
-}

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

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+enum class HebeFilterType(val endpoint: String) {
+    BY_PUPIL("byPupil"),
+    BY_PERSON("byPerson"),
+    BY_PERIOD("byPeriod")
+}

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

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import androidx.core.util.set
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ADDRESSBOOK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ADDRESSBOOK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_EDUCATOR
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_OTHER
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENT
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENTS_COUNCIL
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_STUDENT
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_TEACHER
+import kotlin.text.replace
+
+class VulcanHebeAddressbook(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeAddressbook"
+    }
+
+    private fun String.removeUnitName(unitName: String?): String {
+        return (unitName ?: data.schoolShort)?.let {
+            this.replace("($it)", "").trim()
+        } ?: this
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_ADDRESSBOOK,
+            HebeFilterType.BY_PERSON,
+            lastSync = lastSync,
+            includeFilterType = false
+        ) { list, _ ->
+            list.forEach { person ->
+                val id = person.getString("Id") ?: return@forEach
+                val loginId = person.getString("LoginId") ?: return@forEach
+
+                val idType = id.split("-")
+                    .getOrNull(0)
+                val idLong = id.split("-")
+                    .getOrNull(1)
+                    ?.toLongOrNull()
+                    ?: return@forEach
+
+                val typeBase = when (idType) {
+                    "e" -> TYPE_TEACHER
+                    "c" -> TYPE_PARENT
+                    "p" -> TYPE_STUDENT
+                    else -> TYPE_OTHER
+                }
+
+                val name = person.getString("Name") ?: ""
+                val surname = person.getString("Surname") ?: ""
+                val namePrefix = "$surname $name - "
+
+                val teacher = data.teacherList[idLong] ?: Teacher(
+                    data.profileId,
+                    idLong,
+                    name,
+                    surname,
+                    loginId
+                ).also {
+                    data.teacherList[idLong] = it
+                }
+
+                person.getJsonArray("Roles")?.asJsonObjectList()?.onEach { role ->
+                    var roleText: String? = null
+                    val unitName = role.getString("ConstituentUnitSymbol")
+
+                    val personType = when (role.getInt("RoleOrder")) {
+                        0 -> { /* Wychowawca */
+                            roleText = role.getString("ClassSymbol")
+                                ?.removeUnitName(unitName)
+                            TYPE_EDUCATOR
+                        }
+                        1 -> TYPE_TEACHER /* Nauczyciel */
+                        2 -> return@onEach /* Pracownik */
+                        3 -> { /* Rada rodziców */
+                            roleText = role.getString("Address")
+                                ?.removeUnitName(unitName)
+                                ?.removePrefix(namePrefix)
+                                ?.trim()
+                            TYPE_PARENTS_COUNCIL
+                        }
+                        5 -> {
+                            roleText = role.getString("RoleName")
+                                ?.plus(" - ")
+                                ?.plus(
+                                    role.getString("Address")
+                                        ?.removeUnitName(unitName)
+                                        ?.removePrefix(namePrefix)
+                                        ?.trim()
+                                )
+                            TYPE_STUDENT
+                        }
+                        else -> TYPE_OTHER
+                    }
+
+                    teacher.setTeacherType(personType)
+                    teacher.typeDescription = roleText
+                }
+
+                if (teacher.type == 0)
+                    teacher.setTeacherType(typeBase)
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, 2 * DAY)
+            onSuccess(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK)
+        }
+    }
+}

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

@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2021-2-21
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ATTENDANCE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Attendance
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeAttendance(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+
+    companion object {
+        const val TAG = "VulcanHebeAttendance"
+    }
+
+    init {
+        val semesterNumber = data.studentSemesterNumber
+        val startDate = profile?.getSemesterStart(semesterNumber)
+        val endDate = profile?.getSemesterEnd(semesterNumber)
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_ATTENDANCE,
+            HebeFilterType.BY_PUPIL,
+            dateFrom = startDate,
+            dateTo = endDate,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { attendance ->
+                val id = attendance.getLong("AuxPresenceId") ?: return@forEach
+                val type = attendance.getJsonObject("PresenceType") ?: return@forEach
+                val baseType = getBaseType(type)
+                val typeName = type.getString("Name") ?: return@forEach
+                val typeCategoryId = type.getLong("CategoryId") ?: return@forEach
+                val typeSymbol = type.getString("Symbol") ?: return@forEach
+                val typeShort = when (typeCategoryId.toInt()) {
+                    6, 8 -> typeSymbol
+                    else -> data.app.attendanceManager.getTypeShort(baseType)
+                }
+                val typeColor = when (typeCategoryId.toInt()) {
+                    1 -> 0xffffffff  // obecność
+                    2 -> 0xffffa687  // nieobecność
+                    3 -> 0xfffcc150  // nieobecność usprawiedliwiona
+                    4 -> 0xffede049  // spóźnienie
+                    5 -> 0xffbbdd5f  // spóźnienie usprawiedliwione
+                    6 -> 0xffa9c9fd  // nieobecny z przyczyn szkolnych
+                    7 -> 0xffddbbe5  // zwolniony
+                    8 -> 0xffffffff  // usunięty wpis
+                    else -> null
+                }?.toInt()
+                val date = getDate(attendance, "Day") ?: return@forEach
+                val lessonRange = getLessonRange(attendance, "TimeSlot")
+                val startTime = lessonRange?.startTime
+                val semester = profile?.dateToSemester(date) ?: return@forEach
+                val teacherId = attendance.getJsonObject("TeacherPrimary")?.getLong("Id") ?: -1
+                val subjectId = attendance.getJsonObject("Subject")?.getLong("Id") ?: -1
+                val addedDate = getDateTime(attendance, "DateModify")
+                val lessonNumber = lessonRange?.lessonNumber
+                val isCounted = attendance.getBoolean("CalculatePresence")
+                    ?: (baseType != Attendance.TYPE_RELEASED)
+
+                val attendanceObject = Attendance(
+                    profileId = profileId,
+                    id = id,
+                    baseType = baseType,
+                    typeName = typeName,
+                    typeShort = typeShort,
+                    typeSymbol = typeSymbol,
+                    typeColor = typeColor,
+                    date = date,
+                    startTime = startTime,
+                    semester = semester,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    addedDate = addedDate
+                ).also {
+                    it.lessonTopic = attendance.getString("Topic")
+                    it.lessonNumber = lessonNumber
+                    it.isCounted = isCounted
+                }
+
+                data.attendanceList.add(attendanceObject)
+                if (baseType != Attendance.TYPE_PRESENT) {
+                    data.metadataList.add(
+                        Metadata(
+                            profileId,
+                            Metadata.TYPE_ATTENDANCE,
+                            attendanceObject.id,
+                            profile?.empty ?: true
+                                    || baseType == Attendance.TYPE_PRESENT_CUSTOM
+                                    || baseType == Attendance.TYPE_UNKNOWN,
+                            profile?.empty ?: true
+                                    || baseType == Attendance.TYPE_PRESENT_CUSTOM
+                                    || baseType == Attendance.TYPE_UNKNOWN
+                        )
+                    )
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_ATTENDANCE, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_ATTENDANCE)
+        }
+    }
+
+    fun getBaseType(attendanceType: JsonObject): Int {
+        val absent = attendanceType.getBoolean("Absence") ?: false
+        val excused = attendanceType.getBoolean("AbsenceJustified") ?: false
+        return if (absent) {
+            if (excused)
+                Attendance.TYPE_ABSENT_EXCUSED
+            else
+                Attendance.TYPE_ABSENT
+        } else {
+            val belated = attendanceType.getBoolean("Late") ?: false
+            val released = attendanceType.getBoolean("LegalAbsence") ?: false
+            val present = attendanceType.getBoolean("Presence") ?: true
+            if (belated)
+                if (excused)
+                    Attendance.TYPE_BELATED_EXCUSED
+                else
+                    Attendance.TYPE_BELATED
+            else if (released)
+                Attendance.TYPE_RELEASED
+            else if (present)
+                if (attendanceType.getInt("CategoryId") != 1)
+                    Attendance.TYPE_PRESENT_CUSTOM
+                else
+                    Attendance.TYPE_PRESENT
+            else
+                Attendance.TYPE_UNKNOWN
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_EXAMS
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeExams(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeExams"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_EXAMS,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { exam ->
+                val id = exam.getLong("Id") ?: return@forEach
+                val eventDate = getDate(exam, "Deadline") ?: return@forEach
+                val subjectId = getSubjectId(exam, "Subject") ?: -1
+                val teacherId = getTeacherId(exam, "Creator") ?: -1
+                val teamId = getTeamId(exam, "Distribution")
+                    ?: getClassId(exam, "Class")
+                    ?: data.teamClass?.id
+                    ?: -1
+                val topic = exam.getString("Content")?.trim() ?: ""
+
+                if (!isCurrentYear(eventDate)) return@forEach
+
+                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+
+                val type = when (exam.getString("Type")) {
+                    "Praca klasowa",
+                    "Sprawdzian" -> Event.TYPE_EXAM
+                    "Kartkówka" -> Event.TYPE_SHORT_QUIZ
+                    else -> Event.TYPE_DEFAULT
+                }
+
+                val eventObject = Event(
+                    profileId = profileId,
+                    id = id,
+                    date = eventDate,
+                    time = startTime,
+                    topic = topic,
+                    color = null,
+                    type = type,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    teamId = teamId
+                )
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_EVENT,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_EXAMS, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_EXAMS)
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanHebeGradeSummary(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeGradeSummary"
+    }
+
+    init {
+        val entries = mapOf(
+            "Entry_1" to
+                    if (data.studentSemesterNumber == 1)
+                        Grade.TYPE_SEMESTER1_PROPOSED
+                    else Grade.TYPE_SEMESTER2_PROPOSED,
+            "Entry_2" to
+                    if (data.studentSemesterNumber == 1)
+                        Grade.TYPE_SEMESTER1_FINAL
+                    else Grade.TYPE_SEMESTER2_FINAL
+        )
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { grade ->
+                val subjectId = getSubjectId(grade, "Subject") ?: return@forEach
+                val addedDate = getDateTime(grade, "DateModify")
+
+                entries.onEach { (key, type) ->
+                    val id = subjectId * -100 - type
+                    val entry = grade.getString(key) ?: return@onEach
+                    val value = Utils.getGradeValue(entry)
+                    val color = Utils.getVulcanGradeColor(entry)
+
+                    val gradeObject = Grade(
+                        profileId = profileId,
+                        id = id,
+                        name = entry,
+                        type = type,
+                        value = value,
+                        weight = 0f,
+                        color = color,
+                        category = "",
+                        description = null,
+                        comment = null,
+                        semester = data.studentSemesterNumber,
+                        teacherId = -1,
+                        subjectId = subjectId,
+                        addedDate = addedDate
+                    )
+
+                    data.gradeList.add(gradeObject)
+                    data.metadataList.add(
+                        Metadata(
+                            profileId,
+                            Metadata.TYPE_GRADE,
+                            id,
+                            profile?.empty ?: true,
+                            profile?.empty ?: true
+                        )
+                    )
+                }
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY, 1 * DAY)
+            onSuccess(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY)
+        }
+    }
+}

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

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Grade
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import java.text.DecimalFormat
+import kotlin.math.roundToInt
+
+class VulcanHebeGrades(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeGrades"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_GRADES,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { grade ->
+                val id = grade.getLong("Id") ?: return@forEach
+
+                val column = grade.getJsonObject("Column")
+                val category = column.getJsonObject("Category")
+                val categoryText = category.getString("Name")
+
+                val teacherId = getTeacherId(grade, "Creator") ?: -1
+                val subjectId = getSubjectId(column, "Subject") ?: -1
+
+                val description = column.getString("Name")
+                val comment = grade.getString("Comment")
+                var value = grade.getFloat("Value")
+                var weight = column.getFloat("Weight") ?: 0.0f
+                val numerator = grade.getFloat("Numerator ")
+                val denominator = grade.getFloat("Denominator")
+                val addedDate = getDateTime(grade, "DateModify")
+
+                var finalDescription = ""
+
+                var name = when (numerator != null && denominator != null) {
+                    true -> {
+                        value = numerator / denominator
+                        finalDescription += DecimalFormat("#.##").format(numerator) +
+                                "/" + DecimalFormat("#.##").format(denominator)
+                        weight = 0.0f
+                        (value * 100).roundToInt().toString() + "%"
+                    }
+                    else -> {
+                        if (value == null) weight = 0.0f
+
+                        grade.getString("Content") ?: ""
+                    }
+                }
+
+                comment?.also {
+                    if (name == "") name = it
+                    else finalDescription = (if (finalDescription == "") "" else " ") + it
+                }
+
+                description?.also {
+                    finalDescription = (if (finalDescription == "") "" else " - ") + it
+                }
+
+                val columnColor = column.getInt("Color") ?: 0
+                val color = if (columnColor == 0)
+                    when (name) {
+                        "1-", "1", "1+" -> 0xffd65757
+                        "2-", "2", "2+" -> 0xff9071b3
+                        "3-", "3", "3+" -> 0xffd2ab24
+                        "4-", "4", "4+" -> 0xff50b6d6
+                        "5-", "5", "5+" -> 0xff2cbd92
+                        "6-", "6", "6+" -> 0xff91b43c
+                        else -> 0xff3D5F9C
+                    }.toInt()
+                else
+                    columnColor
+
+                val gradeObject = Grade(
+                    profileId = profileId,
+                    id = id,
+                    name = name,
+                    type = Grade.TYPE_NORMAL,
+                    value = value ?: 0.0f,
+                    weight = weight,
+                    color = color,
+                    category = categoryText,
+                    description = finalDescription,
+                    comment = null,
+                    semester = getSemester(column),
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    addedDate = addedDate
+                )
+
+                data.gradeList.add(gradeObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_GRADE,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADES, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_GRADES)
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.asJsonObjectList
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+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.getLong
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.utils.Utils
+
+class VulcanHebeHomework(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeHomework"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_HOMEWORK,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { exam ->
+                val id = exam.getLong("IdHomework") ?: return@forEach
+                val eventDate = getDate(exam, "Deadline") ?: return@forEach
+                val subjectId = getSubjectId(exam, "Subject") ?: -1
+                val teacherId = getTeacherId(exam, "Creator") ?: -1
+                val teamId = data.teamClass?.id ?: -1
+                val topic = exam.getString("Content")?.trim() ?: ""
+
+                if (!isCurrentYear(eventDate)) return@forEach
+
+                val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate)
+                val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime
+
+                val eventObject = Event(
+                    profileId = profileId,
+                    id = id,
+                    date = eventDate,
+                    time = startTime,
+                    topic = topic,
+                    color = null,
+                    type = Event.TYPE_HOMEWORK,
+                    teacherId = teacherId,
+                    subjectId = subjectId,
+                    teamId = teamId
+                )
+
+                val attachments = exam.getJsonArray("Attachments")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+
+                for (attachment in attachments) {
+                    val fileName = attachment.getString("Name") ?: continue
+                    val url = attachment.getString("Link") ?: continue
+                    val attachmentName = "$fileName:$url"
+                    val attachmentId = Utils.crc32(attachmentName.toByteArray())
+
+                    eventObject.addAttachment(
+                        id = attachmentId,
+                        name = attachmentName
+                    )
+                }
+
+                data.eventList.add(eventObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_HOMEWORK,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_HOMEWORK, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_HOMEWORK)
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+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.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 VulcanHebeLuckyNumber(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeLuckyNumber"
+    }
+
+    init {
+        apiGet(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER,
+            query = mapOf(
+                "constituentId" to data.studentConstituentId.toString(),
+                "day" to Date.getToday().stringY_m_d
+            )
+        ) { lucky: JsonObject?, _ ->
+            // sync tomorrow if lucky number set or is weekend or afternoon
+            var nextSync = Date.getToday().stepForward(0, 0, 1).inMillis
+            if (lucky == null) {
+                if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour < 12) {
+                    // working days morning, sync always
+                    nextSync = SYNC_ALWAYS
+                }
+            }
+            else {
+                val luckyNumberDate = Date.fromY_m_d(lucky.getString("Day")) ?: Date.getToday()
+                val luckyNumber = lucky.getInt("Number") ?: -1
+                val luckyNumberObject = LuckyNumber(
+                    profileId = profileId,
+                    date = luckyNumberDate,
+                    number = luckyNumber
+                )
+
+                data.luckyNumberList.add(luckyNumberObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_LUCKY_NUMBER,
+                        luckyNumberObject.date.value.toLong(),
+                        true,
+                        profile?.empty ?: false
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER, syncAt = nextSync)
+            onSuccess(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER)
+        }
+    }
+}

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

@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonArray
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MAIN
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanHebeMain(
+    override val data: DataVulcan,
+    override val lastSync: Long? = null
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeMain"
+    }
+
+    fun getStudents(
+        profile: Profile?,
+        profileList: MutableList<Profile>?,
+        loginStoreId: Int? = null,
+        firstProfileId: Int? = null,
+        onEmpty: (() -> Unit)? = null,
+        onSuccess: () -> Unit
+    ) {
+        if (profile == null && (profileList == null || loginStoreId == null || firstProfileId == null))
+            throw IllegalArgumentException()
+
+        apiGet(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MAIN,
+            query = mapOf("lastSyncDate" to "null"),
+            baseUrl = profile == null
+        ) { students: JsonArray, _ ->
+            if (students.isEmpty()) {
+                if (onEmpty != null)
+                    onEmpty()
+                else
+                    onSuccess()
+                return@apiGet
+            }
+
+            // safe to assume this will be non-null when creating a profile
+            var profileId = firstProfileId ?: loginStoreId ?: 1
+
+            students.forEach { studentEl ->
+                val student = studentEl.asJsonObject
+
+                val pupil = student.getJsonObject("Pupil")
+                val studentId = pupil.getInt("Id") ?: return@forEach
+
+                // check the student ID in case of not first login
+                if (profile != null && data.studentId != studentId)
+                    return@forEach
+
+                val unit = student.getJsonObject("Unit")
+                val constituentUnit = student.getJsonObject("ConstituentUnit")
+                val login = student.getJsonObject("Login")
+                val periods = student.getJsonArray("Periods")?.map {
+                    it.asJsonObject
+                } ?: listOf()
+
+                val period = periods.firstOrNull {
+                    it.getBoolean("Current", false)
+                } ?: return@forEach
+
+                val periodLevel = period.getInt("Level") ?: return@forEach
+                val semester1 = periods.firstOrNull {
+                    it.getInt("Level") == periodLevel && it.getInt("Number") == 1
+                }
+                val semester2 = periods.firstOrNull {
+                    it.getInt("Level") == periodLevel && it.getInt("Number") == 2
+                }
+
+                val schoolSymbol = unit.getString("Symbol") ?: return@forEach
+                val schoolShort = constituentUnit.getString("Short") ?: return@forEach
+                val schoolCode = "${data.symbol}_$schoolSymbol"
+
+                val studentUnitId = unit.getInt("Id") ?: return@forEach
+                val studentConstituentId = constituentUnit.getInt("Id") ?: return@forEach
+                val studentLoginId = login.getInt("Id") ?: return@forEach
+                //val studentClassId = student.getInt("IdOddzial") ?: return@forEach
+                val studentClassName = student.getString("ClassDisplay") ?: return@forEach
+                val studentFirstName = pupil.getString("FirstName") ?: ""
+                val studentLastName = pupil.getString("Surname") ?: ""
+                val studentNameLong = "$studentFirstName $studentLastName".fixName()
+                val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
+                val userLogin = login.getString("Value") ?: ""
+
+                val studentSemesterId = period.getInt("Id") ?: return@forEach
+                val studentSemesterNumber = period.getInt("Number") ?: return@forEach
+
+                val hebeContext = student.getString("Context")
+
+                val isParent = login.getString("LoginRole").equals("opiekun", ignoreCase = true)
+                val accountName = if (isParent)
+                    login.getString("DisplayName")?.fixName()
+                else null
+
+                val dateSemester1Start = semester1
+                    ?.getJsonObject("Start")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+                val dateSemester2Start = semester2
+                    ?.getJsonObject("Start")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+                val dateYearEnd = semester2
+                    ?.getJsonObject("End")
+                    ?.getString("Date")
+                    ?.let { Date.fromY_m_d(it) }
+
+                val newProfile = profile ?: Profile(
+                    profileId++,
+                    loginStoreId!!,
+                    LOGIN_TYPE_VULCAN,
+                    studentNameLong,
+                    userLogin,
+                    studentNameLong,
+                    studentNameShort,
+                    accountName
+                )
+
+                newProfile.apply {
+                    this.studentClassName = studentClassName
+                    studentData["symbol"] = data.symbol
+
+                    studentData["studentId"] = studentId
+                    studentData["studentUnitId"] = studentUnitId
+                    studentData["studentConstituentId"] = studentConstituentId
+                    studentData["studentLoginId"] = studentLoginId
+                    studentData["studentSemesterId"] = studentSemesterId
+                    studentData["studentSemesterNumber"] = studentSemesterNumber
+                    studentData["semester1Id"] = semester1?.getInt("Id") ?: 0
+                    studentData["semester2Id"] = semester2?.getInt("Id") ?: 0
+                    studentData["schoolSymbol"] = schoolSymbol
+                    studentData["schoolShort"] = schoolShort
+                    studentData["schoolName"] = schoolCode
+                    studentData["hebeContext"] = hebeContext
+                }
+                dateSemester1Start?.let {
+                    newProfile.dateSemester1Start = it
+                    newProfile.studentSchoolYearStart = it.year
+                }
+                dateSemester2Start?.let { newProfile.dateSemester2Start = it }
+                dateYearEnd?.let { newProfile.dateYearEnd = it }
+
+                if (profile != null)
+                    data.setSyncNext(ENDPOINT_VULCAN_HEBE_MAIN, 1 * DAY)
+
+                profileList?.add(newProfile)
+            }
+
+            onSuccess()
+        }
+    }
+}

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

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import androidx.core.util.set
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.navlib.crc16
+import kotlin.text.replace
+
+class VulcanHebeMessages(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeMessagesInbox"
+    }
+
+    private fun getPersonId(json: JsonObject): Long {
+        val senderLoginId = json.getInt("LoginId") ?: return -1
+        /*if (senderLoginId == data.studentLoginId)
+            return -1*/
+
+        val senderName = json.getString("Address") ?: return -1
+        val senderNameSplit = senderName.splitName()
+        val senderLoginIdStr = senderLoginId.toString()
+        val teacher = data.teacherList.singleOrNull { it.loginId == senderLoginIdStr }
+            ?: Teacher(
+                profileId,
+                -1 * crc16(senderName).toLong(),
+                senderNameSplit?.second ?: "",
+                senderNameSplit?.first ?: "",
+                senderLoginIdStr
+            ).also {
+                it.setTeacherType(Teacher.TYPE_OTHER)
+                data.teacherList[it.id] = it
+            }
+        return teacher.id
+    }
+
+    fun getMessages(messageType: Int) {
+        val folder = when (messageType) {
+            TYPE_RECEIVED -> 1
+            TYPE_SENT -> 2
+            TYPE_DELETED -> 3
+            else -> 1
+        }
+        val endpointId = when (messageType) {
+            TYPE_RECEIVED -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+            TYPE_SENT -> ENDPOINT_VULCAN_HEBE_MESSAGES_SENT
+            else -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX
+        }
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MESSAGES,
+            HebeFilterType.BY_PERSON,
+            folder = folder,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { message ->
+                val id = message.getLong("Id") ?: return@forEach
+                val subject = message.getString("Subject") ?: return@forEach
+                val body = message.getString("Content") ?: return@forEach
+
+                val sender = message.getJsonObject("Sender") ?: return@forEach
+
+                val sentDate = getDateTime(message, "DateSent")
+                val readDate = getDateTime(message, "DateRead", default = 0)
+
+                if (!isCurrentYear(sentDate)) return@forEach
+
+                val messageObject = Message(
+                    profileId = profileId,
+                    id = id,
+                    type = messageType,
+                    subject = subject,
+                    body = body.replace("\n", "<br>"),
+                    senderId = if (messageType == TYPE_RECEIVED) getPersonId(sender) else null,
+                    addedDate = sentDate
+                )
+
+                val receivers = message.getJsonArray("Receiver")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+                val receiverReadDate =
+                    if (receivers.size == 1) readDate
+                    else -1
+
+                for (receiver in receivers) {
+                    val messageRecipientObject = MessageRecipient(
+                        profileId,
+                        if (messageType == TYPE_SENT) getPersonId(receiver) else -1,
+                        -1,
+                        receiverReadDate,
+                        id
+                    )
+                    data.messageRecipientList.add(messageRecipientObject)
+                }
+
+                val attachments = message.getJsonArray("Attachments")
+                    ?.asJsonObjectList()
+                    ?: return@forEach
+
+                for (attachment in attachments) {
+                    val fileName = attachment.getString("Name") ?: continue
+                    val url = attachment.getString("Link") ?: continue
+                    val attachmentName = "$fileName:$url"
+                    val attachmentId = Utils.crc32(attachmentName.toByteArray())
+
+                    messageObject.addAttachment(
+                        id = attachmentId,
+                        name = attachmentName,
+                        size = -1
+                    )
+                }
+
+                data.messageList.add(messageObject)
+                data.setSeenMetadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_MESSAGE,
+                        id,
+                        readDate > 0 || messageType == TYPE_SENT,
+                        readDate > 0 || messageType == TYPE_SENT
+                    )
+                )
+            }
+
+            data.setSyncNext(
+                endpointId,
+                if (messageType == TYPE_RECEIVED) SYNC_ALWAYS else 1 * DAY,
+                if (messageType == TYPE_RECEIVED) null else DRAWER_ITEM_MESSAGES
+            )
+            onSuccess(endpointId)
+        }
+    }
+}

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

@@ -1,62 +1,65 @@
 /*
- * Copyright (c) Kacper Ziubryniewicz 2019-11-12
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
  */
 
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
 
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS
+import pl.szczodrzynski.edziennik.JsonObject
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS
 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.VulcanHebe
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 
-class VulcanApiMessagesChangeStatus(override val data: DataVulcan,
+class VulcanHebeMessagesChangeStatus(
-                                    private val messageObject: MessageFull,
+    override val data: DataVulcan,
-                                    val onSuccess: () -> Unit
+    private val messageObject: MessageFull,
-) : VulcanApi(data, null) {
+    val onSuccess: () -> Unit
+) : VulcanHebe(data, null) {
     companion object {
-        const val TAG = "VulcanApiMessagesChangeStatus"
+        const val TAG = "VulcanHebeMessagesChangeStatus"
     }
 
     init {
-        apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS, parameters = mapOf(
+        apiPost(
-                "WiadomoscId" to messageObject.id,
+            TAG,
-                "FolderWiadomosci" to "Odebrane",
+            VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS,
-                "Status" to "Widoczna",
+            payload = JsonObject(
+                "MessageId" to messageObject.id,
                 "LoginId" to data.studentLoginId,
-                "IdUczen" to data.studentId
+                "Status" to 1
-        )) { _, _ ->
+            )
+        ) { _: Boolean, _ ->
 
             if (!messageObject.seen) {
-                data.setSeenMetadataList.add(Metadata(
+                data.setSeenMetadataList.add(
+                    Metadata(
                         profileId,
                         Metadata.TYPE_MESSAGE,
                         messageObject.id,
                         true,
                         true
-                ))
+                    )
-
+                )
                 messageObject.seen = true
             }
 
-            if (messageObject.type != TYPE_SENT) {
+            if (messageObject.type != Message.TYPE_SENT) {
                 val messageRecipientObject = MessageRecipient(
-                        profileId,
+                    profileId,
-                        -1,
+                    -1,
-                        -1,
+                    -1,
-                        System.currentTimeMillis(),
+                    System.currentTimeMillis(),
-                        messageObject.id
+                    messageObject.id
                 )
-
                 data.messageRecipientList.add(messageRecipientObject)
             }
 
             EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
-
             onSuccess()
         }
     }

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2021-2-22
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_NOTICES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notice
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebeNotices(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+
+    companion object {
+        const val TAG = "VulcanHebeNotices"
+    }
+
+    init {
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_NOTICES,
+            HebeFilterType.BY_PUPIL,
+            lastSync = lastSync
+        ) { list, _ ->
+            list.forEach { notice ->
+                val id = notice.getLong("Id") ?: return@forEach
+                val type = when (notice.getBoolean("Positive")) {
+                    true -> Notice.TYPE_POSITIVE
+                    else -> Notice.TYPE_NEUTRAL
+                }
+                val date = getDate(notice, "DateValid") ?: return@forEach
+                val semester = profile?.dateToSemester(date) ?: return@forEach
+                val text = notice.getString("Content") ?: ""
+                val category = notice.getJsonObject("Category")?.getString("Name")
+                val points = notice.getFloat("Points")
+                val teacherId = getTeacherId(notice, "Creator") ?: -1
+                val addedDate = getDateTime(notice, "DateModify")
+
+                if (!isCurrentYear(date)) return@forEach
+
+                val noticeObject = Notice(
+                    profileId = profileId,
+                    id = id,
+                    type = type,
+                    semester = semester,
+                    text = text,
+                    category = category,
+                    points = points,
+                    teacherId = teacherId,
+                    addedDate = addedDate
+                )
+
+                data.noticeList.add(noticeObject)
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_NOTICE,
+                        id,
+                        profile?.empty ?: true,
+                        profile?.empty ?: true
+                    )
+                )
+            }
+
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_NOTICES, SYNC_ALWAYS)
+            onSuccess(ENDPOINT_VULCAN_HEBE_NOTICES)
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonPrimitive
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_PUSH_ALL
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_PUSH_CONFIG
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+
+class VulcanHebePushConfig(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebePushConfig"
+    }
+
+    init {
+        apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_PUSH_ALL,
+            payload = JsonPrimitive("on")
+        ) { _: Boolean, _ ->
+            // sync always: this endpoint has .shouldSync set
+            data.setSyncNext(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG, SYNC_ALWAYS)
+            data.app.config.sync.tokenVulcanList =
+                data.app.config.sync.tokenVulcanList + profileId
+            onSuccess(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG)
+        }
+    }
+}

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-22.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_SEND
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
+import pl.szczodrzynski.edziennik.data.db.entity.Message
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+
+class VulcanHebeSendMessage(
+    override val data: DataVulcan,
+    val recipients: List<Teacher>,
+    val subject: String,
+    val text: String,
+    val onSuccess: () -> Unit
+) : VulcanHebe(data, null) {
+    companion object {
+        const val TAG = "VulcanHebeSendMessage"
+    }
+
+    init {
+        val recipientsArray = JsonArray()
+        recipients.forEach { teacher ->
+            recipientsArray += JsonObject(
+                "Address" to teacher.fullNameLastFirst,
+                "LoginId" to (teacher.loginId?.toIntOrNull() ?: return@forEach),
+                "Initials" to teacher.initialsLastFirst,
+                "AddressHash" to teacher.fullNameLastFirst.sha1Hex()
+            )
+        }
+
+        val senderName = (profile?.accountName ?: profile?.studentNameLong)
+            ?.swapFirstLastName() ?: ""
+        val sender = JsonObject(
+            "Address" to senderName,
+            "LoginId" to data.studentLoginId.toString(),
+            "Initials" to senderName.getNameInitials(),
+            "AddressHash" to senderName.sha1Hex()
+        )
+
+        apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_MESSAGES_SEND,
+            payload = JsonObject(
+                "Status" to 1,
+                "Sender" to sender,
+                "DateSent" to null,
+                "DateRead" to null,
+                "Content" to text,
+                "Receiver" to recipientsArray,
+                "Id" to 0,
+                "Subject" to subject,
+                "Attachments" to null,
+                "Self" to null
+            )
+        ) { json: JsonObject, _ ->
+            val messageId = json.getLong("Id")
+
+            if (messageId == null) {
+                // TODO error
+                return@apiPost
+            }
+
+            VulcanHebeMessages(data, null) {
+                val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject }
+                val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == messageId }
+                val event = MessageSentEvent(data.profileId, message, message?.addedDate)
+
+                EventBus.getDefault().postSticky(event)
+                onSuccess()
+            }.getMessages(Message.TYPE_SENT)
+        }
+    }
+}

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

@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-21.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
+
+import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TIMETABLE
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CANCELLED
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CHANGE
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_NORMAL
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_SOURCE
+import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_TARGET
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class VulcanHebeTimetable(
+    override val data: DataVulcan,
+    override val lastSync: Long?,
+    val onSuccess: (endpointId: Int) -> Unit
+) : VulcanHebe(data, lastSync) {
+    companion object {
+        const val TAG = "VulcanHebeTimetable"
+    }
+
+    private val lessonList = mutableListOf<Lesson>()
+    private val lessonDates = mutableSetOf<Int>()
+
+    init {
+        val previousWeekStart = Week.getWeekStart().stepForward(0, 0, -7)
+        if (Date.getToday().weekDay > 4) {
+            previousWeekStart.stepForward(0, 0, 7)
+        }
+
+        val dateFrom = data.arguments
+            ?.getString("weekStart")
+            ?.let { Date.fromY_m_d(it) }
+            ?: previousWeekStart
+        val dateTo = dateFrom.clone().stepForward(0, 0, 13)
+
+        val lastSync = null
+
+        apiGetList(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_TIMETABLE,
+            HebeFilterType.BY_PUPIL,
+            dateFrom = dateFrom,
+            dateTo = dateTo,
+            lastSync = lastSync
+        ) { lessons, _ ->
+            apiGetList(
+                TAG,
+                VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES,
+                HebeFilterType.BY_PUPIL,
+                dateFrom = dateFrom,
+                dateTo = dateTo,
+                lastSync = lastSync
+            ) { changes, _ ->
+                processData(lessons, changes)
+
+                // cancel lesson changes when caused by a shift
+                for (lesson in lessonList) {
+                    if (lesson.type != TYPE_SHIFTED_TARGET)
+                        continue
+                    lessonList.firstOrNull {
+                        it.oldDate == lesson.date
+                                && it.oldLessonNumber == lesson.lessonNumber
+                                && it.type == TYPE_CHANGE
+                    }?.let {
+                        it.type = TYPE_CANCELLED
+                        it.date = null
+                        it.lessonNumber = null
+                        it.startTime = null
+                        it.endTime = null
+                        it.subjectId = null
+                        it.teacherId = null
+                        it.teamId = null
+                        it.classroom = null
+                    }
+                }
+
+                // add TYPE_NO_LESSONS to empty dates
+                val date: Date = dateFrom.clone()
+                while (date <= dateTo) {
+                    if (!lessonDates.contains(date.value)) {
+                        lessonList.add(Lesson(profileId, date.value.toLong()).apply {
+                            this.type = Lesson.TYPE_NO_LESSONS
+                            this.date = date.clone()
+                        })
+                    }
+
+                    date.stepForward(0, 0, 1)
+                }
+
+                d(
+                    TAG,
+                    "Clearing lessons between ${dateFrom.stringY_m_d} and ${dateTo.stringY_m_d}"
+                )
+
+                data.lessonList.addAll(lessonList)
+
+                data.setSyncNext(ENDPOINT_VULCAN_HEBE_TIMETABLE, SYNC_ALWAYS)
+                onSuccess(ENDPOINT_VULCAN_HEBE_TIMETABLE)
+            }
+        }
+    }
+
+    private fun buildLesson(changes: List<JsonObject>, json: JsonObject): Pair<Lesson, Lesson?>? {
+        val lesson = Lesson(profileId, -1)
+        var lessonShift: Lesson? = null
+
+        val lessonDate = getDate(json, "Date") ?: return null
+        val lessonRange = getLessonRange(json, "TimeSlot")
+        val startTime = lessonRange?.startTime
+        val endTime = lessonRange?.endTime
+        val teacherId = getTeacherId(json, "TeacherPrimary")
+        val classroom = json.getJsonObject("Room").getString("Code")
+        val subjectId = getSubjectId(json, "Subject")
+
+        val teamId = getTeamId(json, "Distribution")
+            ?: getClassId(json, "Clazz")
+            ?: data.teamClass?.id
+            ?: -1
+
+        val change = json.getJsonObject("Change")
+        val changeId = change.getInt("Id")
+        val type = when (change.getInt("Type")) {
+            1 -> TYPE_CANCELLED
+            2 -> TYPE_CHANGE
+            3 -> TYPE_SHIFTED_SOURCE
+            4 -> TYPE_CANCELLED // TODO: 2021-02-21 add showing cancellation reason
+            else -> TYPE_NORMAL
+        }
+
+        lesson.type = type
+        if (type == TYPE_NORMAL) {
+            lesson.date = lessonDate
+            lesson.lessonNumber = lessonRange?.lessonNumber
+            lesson.startTime = startTime
+            lesson.endTime = endTime
+            lesson.subjectId = subjectId
+            lesson.teacherId = teacherId
+            lesson.teamId = teamId
+            lesson.classroom = classroom
+        } else {
+            lesson.oldDate = lessonDate
+            lesson.oldLessonNumber = lessonRange?.lessonNumber
+            lesson.oldStartTime = startTime
+            lesson.oldEndTime = endTime
+            lesson.oldSubjectId = subjectId
+            lesson.oldTeacherId = teacherId
+            lesson.oldTeamId = teamId
+            lesson.oldClassroom = classroom
+        }
+
+        if (type == TYPE_CHANGE || type == TYPE_SHIFTED_SOURCE) {
+            val changeJson = changes.firstOrNull {
+                it.getInt("Id") == changeId
+            } ?: return lesson to null
+
+            val changeLessonDate = getDate(changeJson, "LessonDate") ?: return lesson to null
+            val changeLessonRange = getLessonRange(changeJson, "TimeSlot") ?: lessonRange
+            val changeStartTime = changeLessonRange?.startTime
+            val changeEndTime = changeLessonRange?.endTime
+            val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId
+            val changeClassroom = changeJson.getJsonObject("Room").getString("Code") ?: classroom
+            val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId
+
+            val changeTeamId = getTeamId(json, "Distribution")
+                ?: getClassId(json, "Clazz")
+                ?: teamId
+
+            if (type != TYPE_CHANGE) {
+                /* lesson shifted */
+                lessonShift = Lesson(profileId, -1)
+                lessonShift.type = TYPE_SHIFTED_TARGET
+
+                // update source lesson with the target lesson date
+                lesson.date = changeLessonDate
+                lesson.lessonNumber = changeLessonRange?.lessonNumber
+                lesson.startTime = changeStartTime
+                lesson.endTime = changeEndTime
+                // update target lesson with the source lesson date
+                lessonShift.oldDate = lessonDate
+                lessonShift.oldLessonNumber = lessonRange?.lessonNumber
+                lessonShift.oldStartTime = startTime
+                lessonShift.oldEndTime = endTime
+            }
+
+            (if (type == TYPE_CHANGE) lesson else lessonShift)
+                ?.apply {
+                    this.date = changeLessonDate
+                    this.lessonNumber = changeLessonRange?.lessonNumber
+                    this.startTime = changeStartTime
+                    this.endTime = changeEndTime
+                    this.subjectId = changeSubjectId
+                    this.teacherId = changeTeacherId
+                    this.teamId = changeTeamId
+                    this.classroom = changeClassroom
+                }
+        }
+
+        return lesson to lessonShift
+    }
+
+    private fun processData(lessons: List<JsonObject>, changes: List<JsonObject>) {
+        lessons.forEach { lessonJson ->
+            if (lessonJson.getBoolean("Visible") != true)
+                return@forEach
+
+            val lessonPair = buildLesson(changes, lessonJson) ?: return@forEach
+            val (lessonObject, lessonShift) = lessonPair
+
+            when {
+                lessonShift != null -> lessonShift
+                lessonObject.type != TYPE_NORMAL -> lessonObject
+                else -> null
+            }?.let { lesson ->
+                val lessonDate = lesson.displayDate ?: return@let
+                val seen = profile?.empty ?: true || lessonDate < Date.getToday()
+                data.metadataList.add(
+                    Metadata(
+                        profileId,
+                        Metadata.TYPE_LESSON_CHANGE,
+                        lesson.id,
+                        seen,
+                        seen
+                    )
+                )
+            }
+
+            lessonObject.id = lessonObject.buildId()
+            lessonShift?.id = lessonShift?.buildId() ?: -1
+
+            lessonList.add(lessonObject)
+            lessonShift?.let { lessonList.add(it) }
+
+            lessonObject.displayDate?.let { lessonDates.add(it.value) }
+            lessonShift?.displayDate?.let { lessonDates.add(it.value) }
+        }
+    }
+}

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

@@ -8,23 +8,23 @@ import org.greenrobot.eventbus.EventBus
 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.VulcanApi
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMain
 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.VulcanLoginHebe
 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
 
 class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
     companion object {
         const val TAG = "VulcanFirstLogin"
     }
 
-    private val api = VulcanApi(data, null)
     private val web = VulcanWebMain(data, null)
+    private val hebe = VulcanHebe(data, null)
     private val profileList = mutableListOf<Profile>()
     private val loginStoreId = data.loginStore.id
     private var firstProfileId = loginStoreId
@@ -51,7 +51,7 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
             }
         }
         else {
-            registerDevice {
+            registerDeviceHebe {
                 EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore))
                 onSuccess()
             }
@@ -103,98 +103,25 @@ class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.apiPin = data.apiPin.toMutableMap().also {
                     it[symbol] = json.getString("PIN")
                 }
-                registerDevice(onSuccess)
+                registerDeviceHebe(onSuccess)
             }
         }
     }
 
-    private fun registerDevice(onSuccess: () -> Unit) {
+    private fun registerDeviceHebe(onSuccess: () -> Unit) {
-        VulcanLoginApi(data) {
+        VulcanLoginHebe(data) {
-            api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, _ ->
+            VulcanHebeMain(data).getStudents(
-                val students = json.getJsonArray("Data")
+                profile = null,
-
+                profileList,
-                if (students == null || students.isEmpty()) {
+                loginStoreId,
-                    EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
+                firstProfileId,
+                onEmpty = {
+                    EventBus.getDefault()
+                        .postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore))
                     onSuccess()
-                    return@apiGet
+                },
-                }
+                onSuccess = onSuccess
-
+            )
-                students.forEach { studentEl ->
-                    val student = studentEl.asJsonObject
-
-                    val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach
-                    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
-                    val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@forEach)
-                    val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@forEach
-                    val studentFirstName = student.getString("Imie") ?: ""
-                    val studentLastName = student.getString("Nazwisko") ?: ""
-                    val studentNameLong = "$studentFirstName $studentLastName".fixName()
-                    val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName()
-
-                    val userLogin = student.getString("UzytkownikLogin") ?: ""
-                    val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@forEach
-                    val currentSemesterEndDate = (student.getLong("OkresDataDo") ?: return@forEach) + 86400
-                    val studentSemesterNumber = student.getInt("OkresNumer") ?: return@forEach
-
-                    val isParent = student.getString("UzytkownikRola") == "opiekun"
-                    val accountName = if (isParent)
-                        student.getString("UzytkownikNazwa")?.swapFirstLastName()?.fixName()
-                    else null
-
-                    var dateSemester1Start: Date? = null
-                    var dateSemester2Start: Date? = null
-                    var dateYearEnd: Date? = null
-                    when (studentSemesterNumber) {
-                        1 -> {
-                            dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                        2 -> {
-                            dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000)
-                            dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000)
-                        }
-                    }
-
-                    val profile = Profile(
-                            firstProfileId++,
-                            loginStoreId,
-                            LOGIN_TYPE_VULCAN,
-                            studentNameLong,
-                            userLogin,
-                            studentNameLong,
-                            studentNameShort,
-                            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["schoolShort"] = schoolShort
-                        studentData["schoolName"] = schoolCode
-                        studentData["currentSemesterEndDate"] = currentSemesterEndDate
-                    }
-                    dateSemester1Start?.let {
-                        profile.dateSemester1Start = it
-                        profile.studentSchoolYearStart = it.year
-                    }
-                    dateSemester2Start?.let { profile.dateSemester2Start = it }
-                    dateYearEnd?.let { profile.dateYearEnd = it }
-
-                    profileList.add(profile)
-                }
-
-                onSuccess()
-            }
         }
     }
 }

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

@@ -5,7 +5,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_HEBE
 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
@@ -50,9 +50,9 @@ class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_login_vulcan_web_main)
                 VulcanLoginWebMain(data) { onSuccess(loginMethodId) }
             }
-            LOGIN_METHOD_VULCAN_API -> {
+            LOGIN_METHOD_VULCAN_HEBE -> {
                 data.startProgress(R.string.edziennik_progress_login_vulcan_api)
-                VulcanLoginApi(data) { onSuccess(loginMethodId) }
+                VulcanLoginHebe(data) { onSuccess(loginMethodId) }
             }
         }
     }

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

@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-10-6. 
- */
-
-package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
-
-import android.os.Build
-import com.google.gson.JsonObject
-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.*
-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.data.api.szkolny.SzkolnyApi
-import pl.szczodrzynski.edziennik.utils.Utils.d
-import java.net.HttpURLConnection.HTTP_BAD_REQUEST
-import java.util.*
-import java.util.regex.Pattern
-
-class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) {
-    companion object {
-        private const val TAG = "VulcanLoginApi"
-    }
-
-    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 {
-            if (data.apiFingerprint[data.symbol].isNotNullNorEmpty()
-                    && data.apiPrivateKey[data.symbol].isNotNullNorEmpty()
-                    && data.symbol.isNotNullNorEmpty()) {
-                // (see data.isApiLoginValid())
-                // the semester end date is over
-                VulcanApiUpdateSemester(data, null) { onSuccess() }
-                return@run
-            }
-
-            if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
-                loginWithToken()
-            }
-            else {
-                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
-            }
-        }
-    }}
-
-    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")
-
-        val callback = object : JsonCallbackHandler() {
-            override fun onSuccess(json: JsonObject?, response: Response?) {
-                if (json == null) {
-                    if (response?.code() == HTTP_BAD_REQUEST) {
-                        data.error(TAG, ERROR_LOGIN_VULCAN_INVALID_SYMBOL, response)
-                        return
-                    }
-                    data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY)
-                            .withResponse(response))
-                    return
-                }
-
-                var tokenStatus = json.getString("TokenStatus")
-                if (tokenStatus == "Null" || tokenStatus == "CertGenerated")
-                    tokenStatus = null
-                val error = tokenStatus ?: json.getString("Message")
-                error?.let { code ->
-                    when (code) {
-                        "TokenNotFound" -> ERROR_LOGIN_VULCAN_INVALID_TOKEN
-                        "TokenDead" -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN
-                        "WrongPIN" -> {
-                            Pattern.compile("Liczba pozostałych prób: ([0-9])", Pattern.DOTALL).matcher(tokenStatus).let { matcher ->
-                                if (matcher.matches())
-                                    ERROR_LOGIN_VULCAN_INVALID_PIN + 1 + matcher.group(1).toInt()
-                                else
-                                    ERROR_LOGIN_VULCAN_INVALID_PIN
-                            }
-                        }
-                        "Broken" -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING
-                        "OnlyKindergarten" -> ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN
-                        "NoPupils" -> ERROR_LOGIN_VULCAN_NO_PUPILS
-                        else -> ERROR_LOGIN_VULCAN_OTHER
-                    }.let { errorCode ->
-                        data.error(ApiError(TAG, errorCode)
-                                .withApiResponse(json)
-                                .withResponse(response))
-                        return
-                    }
-                }
-
-                val cert = json.getJsonObject("TokenCert")
-                if (cert == null) {
-                    data.error(ApiError(TAG, ERROR_LOGIN_VULCAN_OTHER)
-                            .withApiResponse(json)
-                            .withResponse(response))
-                    return
-                }
-
-                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("apiPin")
-                onSuccess()
-            }
-
-            override fun onFailure(response: Response?, throwable: Throwable?) {
-                data.error(ApiError(TAG, ERROR_REQUEST_FAILURE)
-                        .withResponse(response)
-                        .withThrowable(throwable))
-            }
-        }
-
-        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[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")
-                .addParameter("DeviceSystemVersion", Build.VERSION.RELEASE)
-                .addParameter("RemoteMobileTimeKey", currentTimeUnix())
-                .addParameter("TimeKey", currentTimeUnix() - 1)
-                .addParameter("RequestId", UUID.randomUUID().toString())
-                .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)
-                .build()
-                .enqueue()
-    }
-}

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2021-2-20.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login
+
+import com.google.gson.JsonObject
+import io.github.wulkanowy.signer.hebe.generateKeyPair
+import pl.szczodrzynski.edziennik.JsonObject
+import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING
+import pl.szczodrzynski.edziennik.data.api.VULCAN_API_DEVICE_NAME
+import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_REGISTER_NEW
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
+import pl.szczodrzynski.edziennik.data.api.models.ApiError
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.getString
+import pl.szczodrzynski.edziennik.isNotNullNorEmpty
+
+class VulcanLoginHebe(val data: DataVulcan, val onSuccess: () -> Unit) {
+    companion object {
+        private const val TAG = "VulcanLoginHebe"
+    }
+
+    init { run {
+        // i'm sure this does something useful
+        // not quite sure what, though
+        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.isHebeLoginValid()) {
+            onSuccess()
+        }
+        else {
+            if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) {
+                loginWithToken()
+            }
+            else {
+                data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING))
+            }
+        }
+    }}
+
+    private fun copyFromLoginStore() {
+        data.loginStore.data.apply {
+            // map form inputs to the symbol
+            if (has("symbol")) {
+                data.symbol = getString("symbol")
+                remove("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() {
+        val szkolnyApi = SzkolnyApi(data.app)
+        val hebe = VulcanHebe(data, null)
+
+        if (data.hebePublicKey == null || data.hebePrivateKey == null || data.hebePublicHash == null) {
+            val (publicPem, privatePem, publicHash) = generateKeyPair()
+            data.hebePublicKey = publicPem
+            data.hebePrivateKey = privatePem
+            data.hebePublicHash = publicHash
+        }
+
+        val firebaseToken = szkolnyApi.runCatching({
+            getFirebaseToken("vulcan")
+        }, onError = {
+            // screw errors
+        }) ?: data.app.config.sync.tokenVulcan
+
+        hebe.apiPost(
+            TAG,
+            VULCAN_HEBE_ENDPOINT_REGISTER_NEW,
+            payload = JsonObject(
+                "OS" to "Android",
+                "PIN" to data.apiPin[data.symbol],
+                "Certificate" to data.hebePublicKey,
+                "CertificateType" to "RSA_PEM",
+                "DeviceModel" to VULCAN_API_DEVICE_NAME,
+                "SecurityToken" to data.apiToken[data.symbol],
+                "SelfIdentifier" to data.buildDeviceId(),
+                "CertificateThumbprint" to data.hebePublicHash
+            ),
+            baseUrl = true,
+            firebaseToken = firebaseToken
+        ) { _: JsonObject, _ ->
+            data.apiToken = data.apiToken.toMutableMap().also {
+                it[data.symbol] = it[data.symbol]?.substring(0, 3)
+            }
+            data.loginStore.removeLoginData("apiPin")
+            onSuccess()
+        }
+    }
+}

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

@@ -13,7 +13,7 @@ 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
+import pl.szczodrzynski.fslogin.realm.toRealm
 
 class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
     companion object {
@@ -30,8 +30,7 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
         }
         else {
             if (data.symbol.isNotNullNorEmpty()
-                    && data.webType.isNotNullNorEmpty()
+                    && data.webRealmData != null
-                    && data.webHost.isNotNullNorEmpty()
                     && (data.webEmail.isNotNullNorEmpty() || data.webUsername.isNotNullNorEmpty())
                     && data.webPassword.isNotNullNorEmpty()) {
                 try {
@@ -56,32 +55,28 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.symbol = getString("symbol")
                 remove("symbol")
             }
+            // 4.6 - form inputs renamed
+            if (has("email")) {
+                data.webEmail = getString("email")
+                remove("email")
+            }
+            if (has("username")) {
+                data.webUsername = getString("username")
+                remove("username")
+            }
+            if (has("password")) {
+                data.webPassword = getString("password")
+                remove("password")
+            }
+        }
+
+        if (data.symbol == null && data.webRealmData != null) {
+            data.symbol = data.webRealmData?.symbol
         }
     }
 
     private fun loginWithCredentials(): Boolean {
-        val realm = when (data.webType) {
+        val realm = data.webRealmData?.toRealm() ?: return false
-            "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()) {
@@ -89,7 +84,7 @@ class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) {
             return true
         }
 
-        val fsLogin = FSLogin(data.app.http, debug = App.debugMode)
+        val fsLogin = FSLogin(data.app.http, debug = App.devMode)
         fsLogin.performLogin(
                 realm = realm,
                 username = data.webUsername ?: data.webEmail ?: return false,

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

@@ -136,7 +136,7 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
     val db: AppDb by lazy { app.db }
 
     init {
-        if (App.devMode) {
+        if (App.debugMode) {
             fakeLogin = loginStore.hasLoginData("fakeLogin")
         }
         clear()

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
@@ -86,11 +88,13 @@ class SzkolnyApi(val app: App) : CoroutineScope {
             withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) }
         }
         catch (e: Exception) {
-            ErrorDetailsDialog(
+            withContext(coroutineContext) {
+                ErrorDetailsDialog(
                     activity,
                     listOf(e.toApiError(TAG)),
                     R.string.error_occured
-            )
+                )
+            }
             null
         }
     }
@@ -112,6 +116,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
@@ -330,8 +350,8 @@ class SzkolnyApi(val app: App) : CoroutineScope {
     }
 
     @Throws(Exception::class)
-    fun getPlatforms(registerName: String): List<LoginInfo.Platform> {
+    fun getRealms(registerName: String): List<LoginInfo.Platform> {
-        val response = api.appLoginPlatforms(registerName).execute()
+        val response = api.fsLoginRealms(registerName).execute()
 
         return parseResponse(response)
     }
@@ -341,4 +361,10 @@ class SzkolnyApi(val app: App) : CoroutineScope {
         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

@@ -33,9 +33,12 @@ 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>>>
+
+    @GET("fsLogin/{registerName}")
+    fun fsLoginRealms(@Path("registerName") registerName: String): Call<ApiResponse<List<LoginInfo.Platform>>>
 }