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

[UI] Fix timetable crash when syncing (#54 )
* Fix removeView * Use removeView() instead of removeAllViews() * Remove dayView from layout file
2025-06-14 06:30:18 +02:00 · 2021-06-15 18:13:18 +02:00 · 2021-06-11 22:06:07 +02:00 · 2021-06-11 00:05:54 +02:00 · 2021-06-06 16:50:04 +02:00 · 2021-06-06 16:47:10 +02:00
10 changed files with 13 additions and 25 deletions
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@ -1,13 +1,7 @@
-<h3>Wersja 4.8, 2021-05-26</h3>
+<h3>Wersja 4.8.2, 2021-06-15</h3>
 <ul>
-    <li>Dodano ikony dla powiadomień. @Luncenok</li>
-    <li>Terminarz: opcje konfiguracji, widok kompaktowy, grupowanie wydarzeń, znaczki nieprzeczytanych, nowe ikony i wiele innych usprawnień.</li>
-    <li>Wiadomości: usprawiono wyszukiwanie - zapisywanie szukanego tekstu po wejściu w wiadomość.</li>
-    <li>Wiadomości: dodano opcję konfiguracji podpisu przy wysyłaniu wiadomości.</li>
-    <li>Plan lekcji: dodano znacznik aktualnej pory dnia w planie lekcji.</li>
-    <li>Powiadomienia: dodano szczegółowy opis po rozwinięciu.</li>
-    <li>Wydarzenia: nowy rodzaj "lekcja online".</li>
-    <li>Naprawiono odbieranie nagrody w easter egg'u.</li>
+    <li>Poprawiono funkcje logowania. @6Arin9</li>
+    <li>Naprawiono zatrzymanie aplikacji na ekranie planu lekcji. @doteq</li>
 </ul>
 <br>
 <br>
--- 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] = {
-	0x71, 0xcf, 0xdf, 0x13, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x1d, 0xa7, 0x6e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };

 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);

--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt
@ -24,7 +24,7 @@ const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php"

 val LIBRUS_USER_AGENT = "${SYSTEM_USER_AGENT}LibrusMobileApp"
 const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0"
-const val LIBRUS_CLIENT_ID = "0RbsDOkV9tyKEQYzlLv5hs3DM1ukrynFI4p6C1Yc"
+const val LIBRUS_CLIENT_ID = "VaItV6oRutdo8fnjJwysnTjVlvaswf52ZqmXsJGP"
 const val LIBRUS_REDIRECT_URL = "app://librus"
 const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code"
 const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action"
@ -43,7 +43,7 @@ const val LIBRUS_API_TOKEN_URL = "https://api.librus.pl/OAuth/Token"
 const val LIBRUS_API_TOKEN_JST_URL = "https://api.librus.pl/OAuth/TokenJST"
 const val LIBRUS_API_AUTHORIZATION = "Mjg6ODRmZGQzYTg3YjAzZDNlYTZmZmU3NzdiNThiMzMyYjE="
 const val LIBRUS_API_SECRET_JST = "18b7c1ee08216f636a1b1a2440e68398"
-const val LIBRUS_API_CLIENT_ID_JST = "49"
+const val LIBRUS_API_CLIENT_ID_JST = "59"
 //const val LIBRUS_API_CLIENT_ID_JST_REFRESH = "42"

 const val LIBRUS_JST_DEMO_CODE = "68656A21"
--- 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.MTIzNDU2Nzg5MDZ/2nExVD===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDn7mcwDD+===.$param2".sha256()
    }
 }
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
@ -151,7 +151,7 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
        }

        b.scrollView.isVisible = true
-        b.dayFrame.removeView(b.dayView)
+        b.dayFrame.removeView(dayView)
        b.dayFrame.addView(dayView, 0)

        // Inflate a label view for each hour the day view will display
--- a/app/src/main/res/layout/timetable_day_fragment.xml
+++ b/app/src/main/res/layout/timetable_day_fragment.xml
@ -36,12 +36,6 @@
                android:layout_marginHorizontal="8dp"
                android:background="@color/md_red_500"
                tools:layout_marginTop="100dp" />
-
-            <com.linkedin.android.tachyon.DayView
-                android:id="@+id/dayView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:layout_height="match_parent" />
        </FrameLayout>
    </pl.szczodrzynski.edziennik.utils.ListenerScrollView>

--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -856,7 +856,7 @@
    <string name="settings_about_licenses_text">Open-Source-Lizenzen</string>
    <string name="settings_about_privacy_policy_text">Datenschutzrichtlinie</string>
    <string name="settings_card_register_title">E-Klassenbuch</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - Mai 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - Juni 2021</string>
    <string name="settings_about_update_subtext">Klicken Sie hier, um nach Aktualisierungen zu suchen</string>
    <string name="settings_about_update_text">Aktualisierung</string>
    <string name="settings_about_version_text">Version</string>
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@ -858,7 +858,7 @@
    <string name="settings_about_licenses_text">Open-source licenses</string>
    <string name="settings_about_privacy_policy_text">Privacy policy</string>
    <string name="settings_card_register_title">E-register</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - May 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nSeptember 2018 - June 2021</string>
    <string name="settings_about_update_subtext">Click to check for updates</string>
    <string name="settings_about_update_text">Update</string>
    <string name="settings_about_version_text">Version</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -921,7 +921,7 @@
    <string name="settings_about_licenses_text">Licencje open-source</string>
    <string name="settings_about_privacy_policy_text">Polityka prywatności</string>
    <string name="settings_card_register_title">E-dziennik</string>
-    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - maj 2021</string>
+    <string name="settings_about_title_subtext">© Kuba Szczodrzyński &amp;&amp; Kacper Ziubryniewicz\nwrzesień 2018 - czerwiec 2021</string>
    <string name="settings_about_update_subtext">Kliknij, aby sprawdzić aktualizacje</string>
    <string name="settings_about_update_text">Aktualizacja</string>
    <string name="settings_about_version_text">Wersja</string>
--- a/build.gradle
+++ b/build.gradle
@ -5,8 +5,8 @@ buildscript {
        kotlin_version = '1.4.31'

        release = [
-                versionName: "4.8",
-                versionCode: 4080099
+                versionName: "4.8.2",
+                versionCode: 4080299
        ]

        setup = [
Author	SHA1	Message	Date
Kuba Szczodrzyński	5a217aca01	[4.8.2] Update build.gradle, signing and changelog.	2021-06-15 18:13:18 +02:00
doteq	4bed62aa6f	[UI] Fix timetable crash when syncing (#54 ) * Fix removeView * Use removeView() instead of removeAllViews() * Remove dayView from layout file	2021-06-11 22:06:07 +02:00
arin	a4d604e146	[API/Librus] Update JST Client ID (#53 ) @6Arin9	2021-06-11 00:05:54 +02:00
Kuba Szczodrzyński	ae4405ef78	[4.8.1] Update build.gradle, signing and changelog.	2021-06-06 16:50:04 +02:00
Kuba Szczodrzyński	71ca51e813	[Strings] Update copyright dates.	2021-06-06 16:47:10 +02:00
B.O.S.S	1bf07d736f	[API/Librus] Update client ID (#51 ) @BxOxSxS	2021-06-02 22:59:57 +02:00