[4.13-rc.3] Update build.gradle, signing and changelog.

app/build.gradle

@@ -208,7 +208,7 @@ dependencies {
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
     implementation "com.github.Applandeo:Material-Calendar-View:15de569cbc" // https://github.com/Applandeo/Material-Calendar-View
     implementation "com.github.CanHub:Android-Image-Cropper:2.2.2" // https://github.com/CanHub/Android-Image-Cropper
-    implementation "com.github.ChuckerTeam.Chucker:library:3.0.1" // https://github.com/ChuckerTeam/chucker
+    implementation "com.github.ChuckerTeam.Chucker:library:3.5.2" // https://github.com/ChuckerTeam/chucker
     implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2" // https://github.com/antonKozyriatskyi/CircularProgressIndicator
     implementation "com.github.bassaer:chatmessageview:2.0.1" // https://github.com/bassaer/ChatMessageView
     implementation "com.github.hypertrack:hyperlog-android:0.0.10" // https://github.com/hypertrack/hyperlog-android

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

@@ -1,4 +1,4 @@
-<h3>Wersja 4.13-rc.2, 2022-10-22</h3>
+<h3>Wersja 4.13-rc.3, 2022-10-23</h3>
 <ul>
     <li>Poprawione powiadomienia na Androidzie 13. @santoni0</li>
     <li>Możliwość dostosowania wyświetlania planu lekcji.</li>

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

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0x54, 0xe7, 0x2a, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x0f, 0x0d, 0x19, 0x4d, 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/usos/data/api/UsosApiTerms.kt

@@ -41,24 +41,18 @@ class UsosApiTerms(
     }
 
     private fun processResponse(json: JsonArray): Boolean {
-        val dates = mutableSetOf<Date>()
+        val today = Date.getToday()
         for (term in json.asJsonObjectList()) {
             if (!term.getBoolean("is_active", false))
                 continue
-            val startDate = term.getString("start_date")?.let { Date.fromY_m_d(it) }
-            val finishDate = term.getString("finish_date")?.let { Date.fromY_m_d(it) }
-            if (startDate != null)
-                dates += startDate
-            if (finishDate != null)
-                dates += finishDate
+            val startDate = term.getString("start_date")?.let { Date.fromY_m_d(it) } ?: continue
+            val finishDate = term.getString("finish_date")?.let { Date.fromY_m_d(it) } ?: continue
+            if (today in startDate..finishDate) {
+                profile?.studentSchoolYearStart = startDate.year
+                profile?.dateSemester1Start = startDate
+                profile?.dateSemester2Start = finishDate
+            }
         }
-        val datesSorted = dates.sorted()
-        if (datesSorted.size != 3)
-            return false
-        profile?.studentSchoolYearStart = datesSorted[0].year
-        profile?.dateSemester1Start = datesSorted[0]
-        profile?.dateSemester2Start = datesSorted[1]
-        profile?.dateYearEnd = datesSorted[2]
         return true
     }
 }

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.MTIzNDU2Nzg5MDCOnsIOWR===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MD7hH6ZvtD===.$param2".sha256()
     }
 }

app/src/main/res/raw/app_data.json

@@ -1,5 +1,6 @@
 {
 	"base": {
+		"configOverrides": {},
 		"messagesConfig": {
 			"subjectLength": null,
 			"bodyLength": null,

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.6.10'
 
         release = [
-                versionName: "4.13-rc.2",
-                versionCode: 4130020
+                versionName: "4.13-rc.3",
+                versionCode: 4130030
         ]
 
         setup = [