github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-01-18 12:56:45 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2022-04-19 23:13:15 +02:00
commit 86c41d9191
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/assets/pl-changelog.html
View File

@ -1,6 +1,6 @@
<h3>Wersja 4.11.4, 2022-03-14</h3> <h3>Wersja 4.11.5, 2022-04-18</h3>
<ul> <ul>
<li>Poprawiono wyświetlanie ocen w przypadku przedmiotów z nieznaną nazwą.</li> <li>Poprawiono działanie dotyku na systemie Android 12 i nowszych.</li>
</ul> </ul>
<br> <br>
<br> <br>

2
app/src/main/cpp/szkolny-signing.cpp
View File

@ -9,7 +9,7 @@
/*secret password - removed for source code publication*/ /*secret password - removed for source code publication*/
static toys AES_IV[16] = { static toys AES_IV[16] = {
0x3d, 0x32, 0x00, 0x89, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; 0x5d, 0x6b, 0xa0, 0x4e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat); unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);

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 provideKey(param1: String, param2: Long): ByteArray {*/
fun pleaseStopRightNow(param1: String, param2: Long): ByteArray { fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
return "$param1.MTIzNDU2Nzg5MDvXV/n0BA===.$param2".sha256() return "$param1.MTIzNDU2Nzg5MDWpYbYnaF===.$param2".sha256()
} }
} }

5
app/src/main/java/pl/szczodrzynski/edziennik/utils/SwipeRefreshLayoutNoIndicator.java
View File

@ -17,6 +17,7 @@
package pl.szczodrzynski.edziennik.utils; package pl.szczodrzynski.edziennik.utils;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -83,7 +84,9 @@ public class SwipeRefreshLayoutNoIndicator extends SwipeRefreshLayout {
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
ev.setSource(0x10000000); if (Build.VERSION.SDK_INT < 32) {
ev.setSource(0x10000000);
}
boolean parentConsumed = parent.onInterceptTouchEvent(ev); boolean parentConsumed = parent.onInterceptTouchEvent(ev);
boolean superConsumed = super.onInterceptTouchEvent(ev); boolean superConsumed = super.onInterceptTouchEvent(ev);
return parentConsumed && superConsumed; return parentConsumed && superConsumed;

4
build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
kotlin_version = '1.5.30' kotlin_version = '1.5.30'
release = [ release = [
versionName: "4.11.4", versionName: "4.11.5",
versionCode: 4110499 versionCode: 4110599
] ]
setup = [ setup = [