diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html
index 11037bae..00648711 100644
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@@ -1,16 +1,9 @@
-
Wersja 4.13-rc.5, 2022-10-25
+Wersja 4.13.2-rc.4, 2022-11-25
- - Poprawione powiadomienia na Androidzie 13. @santoni0
- - Opcja kolorowania bloków w planie lekcji.
- - USOS - pierwsza wersja obsługi systemu. Osobne rodzaje wydarzeń (oraz wygląd niektórych części aplikacji) lepiej dostosowany do nauki na studiach.
- - Możliwość dostosowania wyświetlania planu lekcji.
- - Opcja ustawienia nowych wydarzeń domyślnie jako udostępnione.
- - Poprawione udostępnianie notatek dotyczących danej lekcji
- - Bardziej czytelna legenda rodzaju udostępnionego wydarzenia.
- - Poprawione opcje filtrowania powiadomień i wyboru przycisków menu bocznego.
- - Ulepszony system pobierania aktualizacji aplikacji.
+ - Poprawiono synchronizację w Mobidzienniku bez adresu e-mail.
+ - Poprawiono błąd synchronizacji w Vulcanie.
Dzięki za korzystanie ze Szkolnego!
-© [Kuba Szczodrzyński](@kuba2k2), [Kacper Ziubryniewicz](@kapi2289) 2022
+© [Kuba Szczodrzyński](@kuba2k2) 2022
diff --git a/app/src/main/cpp/szkolny-signing.cpp b/app/src/main/cpp/szkolny-signing.cpp
index cdaa1ec8..bbafe06e 100644
--- a/app/src/main/cpp/szkolny-signing.cpp
+++ b/app/src/main/cpp/szkolny-signing.cpp
@@ -9,7 +9,7 @@
/*secret password - removed for source code publication*/
static toys AES_IV[16] = {
- 0x2f, 0xc0, 0xca, 0x16, 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);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/BaseConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/BaseConfig.kt
index ac3a8af9..69d232c5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/BaseConfig.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/BaseConfig.kt
@@ -14,6 +14,7 @@ import pl.szczodrzynski.edziennik.ext.takePositive
import kotlin.coroutines.CoroutineContext
abstract class BaseConfig(
+ @Transient
val db: AppDb,
val profileId: Int? = null,
protected var entries: List? = null,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
index 54530a4e..2042e8b2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
@@ -33,7 +33,7 @@ class Config(db: AppDb) : BaseConfig(db) {
var update by config(null)
var updatesChannel by config("release")
- var devMode by config(null)
+ var devMode by config("debugMode", null)
var devModePassword by config(null)
var enableChucker by config(null)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/DelegateConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/DelegateConfig.kt
index 00ede071..91dac668 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/DelegateConfig.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/DelegateConfig.kt
@@ -115,9 +115,9 @@ class ConfigDelegate(
is Boolean -> value
// enums, maps & collections
is Enum<*> -> value.toInt()
- is Collection<*> -> JsonArray(value.map {
+ is Collection<*> -> value.map {
if (it is Number || it is Boolean) it else serialize(it, serializeObjects = false)
- })
+ }.toJsonElement()
is Map<*, *> -> gson.toJson(value.mapValues { (_, it) ->
if (it is Number || it is Boolean) it else serialize(it, serializeObjects = false)
})
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
index 754bbc03..83536977 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt
@@ -36,7 +36,7 @@ class LibrusApiNotices(override val data: DataLibrus,
val id = note.getLong("Id") ?: return@forEach
val text = note.getString("Text") ?: ""
val categoryId = note.getJsonObject("Category")?.getLong("Id") ?: -1
- val teacherId = note.getJsonObject("AddedBy")?.getLong("Id") ?: -1
+ val teacherId = note.getJsonObject("Teacher")?.getLong("Id") ?: -1
val addedDate = note.getString("Date")?.let { Date.fromY_m_d(it) } ?: return@forEach
val type = when (note.getInt("Positive")) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
index 0e50467c..e8a1e1a6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt
@@ -125,7 +125,7 @@ class LibrusMessagesGetMessage(override val data: DataLibrus,
val receiverId = teacher?.id ?: -1
teacher?.loginId = receiverLoginId
- val readDateText = message.select("readed").text()
+ val readDateText = receiver.select("readed").text()
val readDate = when (readDateText.isNotNullNorEmpty()) {
true -> Date.fromIso(readDateText)
else -> 0
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAccountEmail.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAccountEmail.kt
index 9dc3878c..6c252678 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAccountEmail.kt
+++ b/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)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt
index 9258886b..01d7b9b7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt
+++ b/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()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
index a99ac7a4..83963340 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt
+++ b/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 = 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 = mapOf(),
includeFilterType: Boolean = true,
+ allow404: Boolean = false,
onSuccess: (data: List, 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 ->
- onSuccess(json.map { it.asJsonObject }, response)
+ apiGet(tag, url, query, allow404 = allow404) { json: JsonArray?, response ->
+ onSuccess(json?.map { it.asJsonObject } ?: listOf(), response)
}
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt
index d7bec22b..5893486b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt
+++ b/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
- ) { list, _ ->
+ includeFilterType = false,
+ 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
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
index 922cb6dd..954d6bb1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
@@ -324,11 +324,14 @@ class SzkolnyApi(val app: App) : CoroutineScope {
}
@Throws(Exception::class)
- fun shareNote(note: Note) {
+ fun shareNote(note: Note, teamId: Long? = null) {
val profile = app.db.profileDao().getByIdNow(note.profileId)
?: throw NullPointerException("Profile is not found")
- val team = app.db.teamDao().getClassNow(note.profileId)
- ?: throw NullPointerException("TeamClass is not found")
+ val team = if (teamId == null)
+ app.db.teamDao().getClassNow(note.profileId)
+ else
+ app.db.teamDao().getByIdNow(note.profileId, teamId)
+ team ?: throw NullPointerException("TeamClass is not found")
val response = api.shareNote(NoteShareRequest(
deviceId = app.deviceId,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
index 630fd5bd..e06a5d2b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
+++ b/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.MTIzNDU2Nzg5MDF1TqH/cn===.$param2".sha256()
+ return "$param1.MTIzNDU2Nzg5MDLWJ/cfbN===.$param2".sha256()
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Noteable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Noteable.kt
index 052596b3..8881c1b4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Noteable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Noteable.kt
@@ -9,6 +9,7 @@ interface Noteable {
fun getNoteType(): Note.OwnerType
fun getNoteOwnerProfileId(): Int
fun getNoteOwnerId(): Long
+ fun getNoteShareTeamId(): Long? = null
var notes: MutableList
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
index c5d3f542..8e689883 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt
@@ -91,6 +91,7 @@ open class Profile(
get() = registration == REGISTRATION_ENABLED && !archived
@delegate:Ignore
+ @delegate:Transient
val config by lazy { App.config[this.id] }
override fun getImageDrawable(context: Context) = this.getDrawable(context)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/enums/LoginMethod.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/enums/LoginMethod.kt
index be298b9a..64b0b7ca 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/enums/LoginMethod.kt
+++ b/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,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
index 3eb681f2..332b7ce5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Event
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
import pl.szczodrzynski.edziennik.data.db.entity.Note
import pl.szczodrzynski.edziennik.data.db.entity.Noteable
+import pl.szczodrzynski.edziennik.ext.takePositive
import pl.szczodrzynski.edziennik.ui.search.Searchable
import pl.szczodrzynski.edziennik.utils.html.BetterHtml
import pl.szczodrzynski.edziennik.utils.models.Date
@@ -118,4 +119,5 @@ class EventFull(
override fun getNoteType() = Note.OwnerType.EVENT
override fun getNoteOwnerProfileId() = profileId
override fun getNoteOwnerId() = id
+ override fun getNoteShareTeamId() = teamId.takePositive()
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt
index cb149ce9..b61bba30 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt
@@ -9,6 +9,7 @@ import pl.szczodrzynski.edziennik.R
import pl.szczodrzynski.edziennik.data.db.entity.Lesson
import pl.szczodrzynski.edziennik.data.db.entity.Note
import pl.szczodrzynski.edziennik.data.db.entity.Noteable
+import pl.szczodrzynski.edziennik.ext.takePositive
import pl.szczodrzynski.edziennik.utils.models.Time
class LessonFull(
@@ -142,4 +143,5 @@ class LessonFull(
override fun getNoteType() = Note.OwnerType.LESSON
override fun getNoteOwnerProfileId() = profileId
override fun getNoteOwnerId() = ownerId
+ override fun getNoteShareTeamId() = teamId.takePositive()
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/JsonExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/JsonExtensions.kt
index 5342b330..b91399a6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/JsonExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/JsonExtensions.kt
@@ -5,6 +5,7 @@
package pl.szczodrzynski.edziennik.ext
import android.os.Bundle
+import com.google.gson.Gson
import com.google.gson.JsonArray
import com.google.gson.JsonElement
import com.google.gson.JsonObject
@@ -48,6 +49,11 @@ fun JsonObject.putEnum(key: String, value: Enum<*>) = addProperty(key, value.toI
fun String.toJsonObject(): JsonObject? = try { JsonParser.parseString(this).asJsonObject } catch (ignore: Exception) { null }
fun String.toJsonArray(): JsonArray? = try { JsonParser.parseString(this).asJsonArray } catch (ignore: Exception) { null }
+fun Any?.toJsonElement(): JsonElement = when (this) {
+ is Collection<*> -> JsonArray(this)
+ else -> Gson().toJsonTree(this)
+}
+
operator fun JsonObject.set(key: String, value: JsonElement) = this.add(key, value)
operator fun JsonObject.set(key: String, value: Boolean) = this.addProperty(key, value)
operator fun JsonObject.set(key: String, value: String?) = this.addProperty(key, value)
@@ -67,6 +73,7 @@ fun JsonObject(vararg properties: Pair): JsonObject {
is Number -> addProperty(key, value)
is Boolean -> addProperty(key, value)
is Enum<*> -> addProperty(key, value.toInt())
+ else -> add(key, property.toJsonElement())
}
}
}
@@ -98,6 +105,8 @@ fun JsonArray(properties: Collection): JsonArray {
is Char -> add(property as Char?)
is Number -> add(property as Number?)
is Boolean -> add(property as Boolean?)
+ is Enum<*> -> add(property.toInt())
+ else -> add(property.toJsonElement())
}
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt
index 5ddb5dcb..e53950f9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/MiscExtensions.kt
@@ -76,6 +76,9 @@ fun pendingIntentFlag(): Int {
fun Int?.takeValue() = if (this == -1) null else this
fun Int?.takePositive() = if (this == -1 || this == 0) null else this
+fun Long?.takeValue() = if (this == -1L) null else this
+fun Long?.takePositive() = if (this == -1L || this == 0L) null else this
+
fun String?.takeValue() = if (this.isNullOrBlank()) null else this
fun Any?.ignore() = Unit
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
index 965fc41b..f5523eec 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
@@ -75,6 +75,7 @@ class HomeTimetableCard(
private var counterJob: Job? = null
private var counterStart: Time? = null
private var counterEnd: Time? = null
+ private var showAllLessons: Boolean = false
private var subjectSpannable: CharSequence? = null
private val ignoreCancelled = false
@@ -276,6 +277,8 @@ class HomeTimetableCard(
counterJob = startCoroutineTimer(repeatMillis = 500) {
count()
}
+
+ showAllLessons = !isOngoing
}
else {
val isTomorrow = today.clone().stepForward(0, 0, 1) == timetableDate
@@ -312,12 +315,22 @@ class HomeTimetableCard(
} ?: run {
b.classroom.visibility = View.GONE
}
+
+ showAllLessons = true
}
val text = mutableListOf(
+ if (showAllLessons)
+ activity.getString(R.string.home_timetable_all_lessons)
+ else
activity.getString(R.string.home_timetable_later)
)
- val nextLessons = lessons.drop(skipFirst + 1)
+
+ val nextLessons = if (showAllLessons)
+ lessons.drop(skipFirst)
+ else
+ lessons.drop(skipFirst + 1)
+
for (lesson in nextLessons) {
text += listOf(
lesson.displayStartTime?.stringHM,
@@ -348,6 +361,14 @@ class HomeTimetableCard(
}
val now = syncedNow
+ if (now >= counterStart && showAllLessons) {
+ // update "next lessons" view to remove current lesson
+ this.counterJob?.cancel()
+ this.counterStart = null
+ this.counterEnd = null
+ update()
+ return
+ }
if (now > counterEnd) {
// the lesson is already over
b.progress.visibility = View.GONE
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
index df101849..8114a6db 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notes/NoteEditorDialog.kt
@@ -87,7 +87,12 @@ class NoteEditorDialog(
.show()
}
- val success = manager.saveNote(activity, note, wasShared = editingNote?.isShared ?: false)
+ val success = manager.saveNote(
+ activity = activity,
+ note = note,
+ teamId = owner?.getNoteShareTeamId(),
+ wasShared = editingNote?.isShared ?: false,
+ )
progressDialog?.dismiss()
return success
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/NoteManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/NoteManager.kt
index 67ac306b..866555bd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/NoteManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/NoteManager.kt
@@ -93,10 +93,15 @@ class NoteManager(private val app: App) {
return getOwner(note) != null
}
- suspend fun saveNote(activity: AppCompatActivity, note: Note, wasShared: Boolean): Boolean {
+ suspend fun saveNote(
+ activity: AppCompatActivity,
+ note: Note,
+ teamId: Long?,
+ wasShared: Boolean,
+ ): Boolean {
val success = when {
!note.isShared && wasShared -> unshareNote(activity, note)
- note.isShared -> shareNote(activity, note)
+ note.isShared -> shareNote(activity, note, teamId)
else -> true
}
@@ -124,9 +129,9 @@ class NoteManager(private val app: App) {
return true
}
- private suspend fun shareNote(activity: AppCompatActivity, note: Note): Boolean {
+ private suspend fun shareNote(activity: AppCompatActivity, note: Note, teamId: Long?): Boolean {
return app.api.runCatching(activity) {
- shareNote(note)
+ shareNote(note, teamId)
} != null
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
index 30dc4cc2..9a07ae2c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
@@ -426,4 +426,10 @@ public class Date implements Comparable, Noteable {
public boolean hasReplacingNotes() {
return Noteable.DefaultImpls.hasReplacingNotes(this);
}
+
+ @Nullable
+ @Override
+ public Long getNoteShareTeamId() {
+ return Noteable.DefaultImpls.getNoteShareTeamId(this);
+ }
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fd589d1d..b86e1309 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -847,7 +847,7 @@
Open-Source-Lizenzen
Datenschutzrichtlinie
E-Klassenbuch
- © Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - 2022
+ © Kuba Szczodrzyński, September 2018 - 2022
Klicken Sie hier, um nach Aktualisierungen zu suchen
Aktualisierung
Version
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c8af89c2..50043dac 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -849,7 +849,7 @@
Open-source licenses
Privacy policy
E-register
- © Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 – 2022
+ © Kuba Szczodrzyński, September 2018 – 2022
Click to check for updates
Update
Version
@@ -1433,4 +1433,5 @@
Details
Agenda settings
Share notes
+ All lessons:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03511a9e..487b9c09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -916,7 +916,7 @@
Licencje open-source
Polityka prywatności
E-dziennik
- © Kuba Szczodrzyński && Kacper Ziubryniewicz\nwrzesień 2018 - 2022
+ © Kuba Szczodrzyński, wrzesień 2018 - 2022
Kliknij, aby sprawdzić aktualizacje
Aktualizacja
Wersja
@@ -1550,4 +1550,5 @@
Domyślnie udostępniaj wydarzenia
Ustaw tworzone wydarzenia domyślnie jako udostępnione
Rejestracja
+ Wszystkie lekcje:
diff --git a/build.gradle b/build.gradle
index 6e7e0460..5a8ba98c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
kotlin_version = '1.6.10'
release = [
- versionName: "4.13-rc.5",
- versionCode: 4130050
+ versionName: "4.13.2-rc.4",
+ versionCode: 4130240
]
setup = [