[4.13.2-rc.4] Update build.gradle, signing and changelog.

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

@@ -1,9 +1,7 @@
-<h3>Wersja 4.13.1, 2022-11-03</h3>
+<h3>Wersja 4.13.2-rc.4, 2022-11-25</h3>
 <ul>
-    <li>Edycja kart na stronie głównej znowu działa.</li>
+    <li>Poprawiono synchronizację w Mobidzienniku bez adresu e-mail.</li>
-    <li>Poprawiono pobieranie nauczyciela w zakładce Uwagi. @BxOxSxS</li>
+    <li>Poprawiono błąd synchronizacji w Vulcanie.</li>
-    <li>Poprawiono oznaczanie daty przeczytania wiadomości wysłanych. @BxOxSxS</li>
-    <li>Dodano tłumaczenie karty planu lekcji. @MedzikUser</li>
 </ul>
 <br>
 <br>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xe8, 0x2b, 0x2c, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0xc5, 0x67, 0x62, 0x67, 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/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAccountEmail.kt

@@ -10,6 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.ENDPOINT_MOBID
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb
 import pl.szczodrzynski.edziennik.ext.DAY
 import pl.szczodrzynski.edziennik.ext.get
+import pl.szczodrzynski.edziennik.ext.isNotNullNorBlank
 
 class MobidziennikWebAccountEmail(override val data: DataMobidziennik,
                                   override val lastSync: Long?,
@@ -24,7 +25,8 @@ class MobidziennikWebAccountEmail(override val data: DataMobidziennik,
             MobidziennikLuckyNumberExtractor(data, text)
 
             val email = Regexes.MOBIDZIENNIK_ACCOUNT_EMAIL.find(text)?.let { it[1] }
-            data.loginEmail = email
+            if (email.isNotNullNorBlank())
+                data.loginEmail = email
 
             data.setSyncNext(ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL, if (email == null) 3* DAY else 7* DAY)
             onSuccess(ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL)

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

@@ -16,6 +16,7 @@ import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.ext.JsonObject
 import pl.szczodrzynski.edziennik.ext.getJsonObject
 import pl.szczodrzynski.edziennik.ext.getString
+import pl.szczodrzynski.edziennik.ext.isNotNullNorBlank
 import pl.szczodrzynski.edziennik.ext.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.utils.Utils
 
@@ -77,7 +78,9 @@ class MobidziennikLoginApi2(val data: DataMobidziennik, val onSuccess: () -> Uni
                     }
                 }
 
-                data.loginEmail = json.getString("email")
+                val email = json.getString("email")
+                if (email.isNotNullNorBlank())
+                    data.loginEmail = email
                 data.globalId = json.getString("id_global")
                 data.loginId = json.getString("login")
                 onSuccess()

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

@@ -26,6 +26,7 @@ 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.HttpURLConnection.HTTP_NOT_FOUND
 import java.net.URLEncoder
 import java.time.Instant
 import java.time.LocalDateTime
@@ -183,6 +184,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
         payload: JsonElement? = null,
         baseUrl: Boolean = false,
         firebaseToken: String? = null,
+        allow404: Boolean = false,
         crossinline onSuccess: (json: T, response: Response?) -> Unit
     ) {
         val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint"
@@ -295,6 +297,19 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
             }
 
             override fun onFailure(response: Response?, throwable: Throwable?) {
+                if (allow404 && response?.code() == HTTP_NOT_FOUND) {
+                    try {
+                        onSuccess(null as T, response)
+                    } catch (e: Exception) {
+                        data.error(
+                            ApiError(tag, EXCEPTION_VULCAN_HEBE_REQUEST)
+                                .withResponse(response)
+                                .withThrowable(e)
+                        )
+                    }
+                    return
+                }
+
                 data.error(
                     ApiError(tag, ERROR_REQUEST_FAILURE)
                         .withResponse(response)
@@ -338,6 +353,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
         query: Map<String, String> = mapOf(),
         baseUrl: Boolean = false,
         firebaseToken: String? = null,
+        allow404: Boolean = false,
         crossinline onSuccess: (json: T, response: Response?) -> Unit
     ) {
         val queryPath = query.map {
@@ -348,6 +364,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
             if (query.isNotEmpty()) "$endpoint?$queryPath" else endpoint,
             baseUrl = baseUrl,
             firebaseToken = firebaseToken,
+            allow404 = allow404,
             onSuccess = onSuccess
         )
     }
@@ -382,6 +399,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
         messageBox: String? = null,
         params: Map<String, String> = mapOf(),
         includeFilterType: Boolean = true,
+        allow404: Boolean = false,
         onSuccess: (data: List<JsonObject>, response: Response?) -> Unit
     ) {
         val url = if (includeFilterType && filterType != null)
@@ -427,8 +445,8 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
             )
             .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
 
-        apiGet(tag, url, query) { json: JsonArray, response ->
+        apiGet(tag, url, query, allow404 = allow404) { json: JsonArray?, response ->
-            onSuccess(json.map { it.asJsonObject }, response)
+            onSuccess(json?.map { it.asJsonObject } ?: listOf(), response)
         }
     }
 }

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

@@ -19,6 +19,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENTS_
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_STUDENT
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_TEACHER
 import pl.szczodrzynski.edziennik.ext.*
+import java.net.HttpURLConnection.HTTP_NOT_FOUND
 
 class VulcanHebeAddressbook(
     override val data: DataVulcan,
@@ -41,8 +42,15 @@ class VulcanHebeAddressbook(
             VULCAN_HEBE_ENDPOINT_ADDRESSBOOK,
             HebeFilterType.BY_PERSON,
             lastSync = lastSync,
-            includeFilterType = false
+            includeFilterType = false,
-        ) { list, _ ->
+            allow404 = true,
+        ) { list, response ->
+            if (response?.code() == HTTP_NOT_FOUND) {
+                data.setSyncNext(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, 2 * DAY)
+                onSuccess(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK)
+                return@apiGetList
+            }
+
             list.forEach { person ->
                 val id = person.getString("Id") ?: return@forEach
 

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

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

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

@@ -6,6 +6,8 @@ package pl.szczodrzynski.edziennik.data.db.enums
 
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.ext.getString
+import pl.szczodrzynski.edziennik.ext.isNotNullNorBlank
 
 enum class LoginMethod(
     val loginType: LoginType,
@@ -26,7 +28,7 @@ enum class LoginMethod(
     MOBIDZIENNIK_API2(
         loginType = LoginType.MOBIDZIENNIK,
         id = 1300,
-        isPossible = { profile, _ -> profile?.studentData?.has("email") ?: false },
+        isPossible = { profile, _ -> profile?.studentData?.getString("email").isNotNullNorBlank() },
     ),
     LIBRUS_PORTAL(
         loginType = LoginType.LIBRUS,
@@ -57,7 +59,7 @@ enum class LoginMethod(
     VULCAN_WEB_MAIN(
         loginType = LoginType.VULCAN,
         id = 4100,
-        isPossible = { _, loginStore -> loginStore.hasLoginData("webHost") },
+        isPossible = { _, loginStore -> loginStore.getLoginData("webHost", null).isNotNullNorBlank() },
     ),
     VULCAN_HEBE(
         loginType = LoginType.VULCAN,

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.6.10'
 
         release = [
-                versionName: "4.13.1",
+                versionName: "4.13.2-rc.4",
-                versionCode: 4130199
+                versionCode: 4130240
         ]
 
         setup = [