diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html
index a7dbbd6c..3fa725f2 100644
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@@ -1,15 +1,10 @@
-
Wersja 4.0-rc.5, 2020-04-05
-
- - Możliwość pobierania załączników do zadań domowych (Librus, MobiDziennik, iDziennik).
- - Widok pełnej treści zadań domowych (iDziennik, EduDziennik).
- - Wyszukiwarka wiadomości, pozwalająca na łatwe znalezienie potrzebnej konwersacji.
- - Możliwość usuwania odebranych wiadomości w aplikacji.
-
-
+
Dzięki za korzystanie ze Szkolnego!
diff --git a/app/src/main/cpp/szkolny-signing.cpp b/app/src/main/cpp/szkolny-signing.cpp
index 20dd9492..6463e8af 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] = {
- 0x7b, 0x51, 0x86, 0xc5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ 0x38, 0xd4, 0x73, 0xaf, 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/data/api/szkolny/interceptor/Signing.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
index 47f633f6..65a3be61 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.MTIzNDU2Nzg5MD43hCWBBS===.$param2".sha256()
+ return "$param1.MTIzNDU2Nzg5MDP/4SAI6B===.$param2".sha256()
}
}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
index 0dce6297..58015a0a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
@@ -112,6 +112,9 @@ class SubjectViewHolder(
))
}
+ // remove previously added grades from year preview
+ if (b.yearContainer.childCount > 1)
+ b.yearContainer.removeViews(1, b.yearContainer.childCount - 1)
// add the yearly grades to summary container (expanded)
item.proposedGrade?.let {
b.yearContainer.addView(GradeView(
diff --git a/build.gradle b/build.gradle
index 705a0c97..6143c28c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
kotlin_version = '1.3.61'
release = [
- versionName: "4.0-rc.5",
- versionCode: 4000059
+ versionName: "4.0",
+ versionCode: 4000099
]
setup = [