github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-06-16 23:41:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/new-login

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2020-04-20 19:05:05 +02:00
parent 27e49b10fd 13a3f66db3
commit e8dad29e5d
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt
View File

@ -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()
}
}

3
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
View File

@ -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(