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

@@ -1,7 +1,6 @@
-<h3>Wersja 4.12.1, 2022-09-23</h3>
+<h3>Wersja 4.11.9, 2022-09-18</h3>
 <ul>
     <li>Vulcan UONET+: naprawiono działanie systemu wiadomości. @Antoni-Czaplicki</li>
-    <li>Vulcan UONET+: naprawiono błędy wersji 4.11.9 i starszych.</li>
     <li>Poprawiono wyświetlanie lekcji odwołanych na stronie głównej.</li>
     <li>Dodano dostęp do Laboratorium na ekranie logowania.</li>
     <li>Usunięto obsługę dziennika EduDziennik. [*]</li>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xdf, 0xe4, 0x2d, 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x50, 0x1a, 0x1e, 0x42, 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/vulcan/data/hebe/VulcanHebeMessageBoxes.kt

@@ -26,24 +26,16 @@ class VulcanHebeMessageBoxes(
             VULCAN_HEBE_ENDPOINT_MESSAGEBOX,
             lastSync = lastSync
         ) { list, _ ->
-            var found = false
             for (messageBox in list) {
                 val name = messageBox.getString("Name") ?: continue
                 val studentName = profile?.studentNameLong ?: continue
-                if (!name.contains(studentName))
+                if (!name.startsWith(studentName))
                     continue
 
                 data.messageBoxKey = messageBox.getString("GlobalKey")
                 data.messageBoxName = name
-                found = true
                 break
             }
-            if (!found && list.isNotEmpty()) {
-                list.firstOrNull()?.let { messageBox ->
-                    data.messageBoxKey = messageBox.getString("GlobalKey")
-                    data.messageBoxName = messageBox.getString("Name")
-                }
-            }
             data.setSyncNext(ENDPOINT_VULCAN_HEBE_MESSAGE_BOXES, 7 * DAY)
             onSuccess(ENDPOINT_VULCAN_HEBE_MESSAGE_BOXES)
         }

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

@@ -98,6 +98,9 @@ class VulcanHebeMessages(
                 val receivers = message.getJsonArray("Receiver")
                     ?.asJsonObjectList()
                     ?: return@forEach
+                val receiverReadDate =
+                    if (receivers.size == 1) readDate
+                    else -1
 
                 for (receiver in receivers) {
                     val recipientId = if (messageType == TYPE_SENT)
@@ -105,8 +108,6 @@ class VulcanHebeMessages(
                     else
                         -1
 
-                    val receiverReadDate = receiver.getLong("HasRead", -1)
-
                     val messageRecipientObject = MessageRecipient(
                         profileId,
                         recipientId,

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

@@ -24,7 +24,7 @@ class VulcanHebeMessagesChangeStatus(
     }
 
     init { let {
-        val messageKey = messageObject.body?.let { data.parseMessageMeta(it) }?.get("uuid") ?: run {
+        val messageKey = messageObject.body?.let { data.parseMessageMeta(it) }?.get("globalKey") ?: run {
             EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
             onSuccess()
             return@let

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.MTIzNDU2Nzg5MDJgAI/q8c===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDqhAT3mMQ===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFormFragment.kt

@@ -156,12 +156,12 @@ class LoginFormFragment : Fragment(), CoroutineScope {
         }
 
         if (credential.qrDecoderClass != null) {
-            b.textLayout.endIconMode = TextInputLayout.END_ICON_CUSTOM
             b.textLayout.endIconDrawable = IconicsDrawable(activity).apply {
                 icon = CommunityMaterial.Icon3.cmd_qrcode
                 sizeDp = 24
                 colorAttr(activity, R.attr.colorOnBackground)
             }
+            b.textLayout.endIconMode = TextInputLayout.END_ICON_CUSTOM
             b.textLayout.setEndIconOnClickListener {
                 scanQrCode(credential)
             }

app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt

@@ -409,7 +409,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
         // create an intent used to display the lesson details dialog
         val itemIntent = Intent(app, LessonDialogActivity::class.java)
         itemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK/* or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
-        val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, PendingIntent.FLAG_MUTABLE)
+        val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, pendingIntentFlag())
         views.setPendingIntentTemplate(R.id.widgetTimetableListView, itemPendingIntent)
 
         if (!unified)

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.6.10'
 
         release = [
-                versionName: "4.12.1",
-                versionCode: 4120199
+                versionName: "4.11.9",
+                versionCode: 4110999
         ]
 
         setup = [