diff --git a/app/build.gradle b/app/build.gradle index 710aec8f..7ee81956 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -151,7 +151,7 @@ dependencies { implementation "com.jaredrummler:colorpicker:1.0.2" implementation("com.squareup.okhttp3:okhttp") { version { - strictly "3.12.2" + strictly "3.12.13" } } implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update diff --git a/app/proguard/app.pro b/app/proguard/app.pro index b96a904c..8b3e3e2b 100644 --- a/app/proguard/app.pro +++ b/app/proguard/app.pro @@ -66,4 +66,4 @@ -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; } -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; } --keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo.Platform { *; } +-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; } diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html index 165582ec..f22c959b 100644 --- a/app/src/main/assets/pl-changelog.html +++ b/app/src/main/assets/pl-changelog.html @@ -1,6 +1,7 @@ -

Wersja 4.5-beta.2, 2021-02-21

+

Wersja 4.5, 2021-02-21



diff --git a/app/src/main/cpp/szkolny-signing.cpp b/app/src/main/cpp/szkolny-signing.cpp index b2b15406..0176acf6 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] = { - 0x42, 0xf5, 0x8e, 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + 0x4f, 0x43, 0x04, 0x06, 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/config/Config.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt index 98240be5..5cdf30bc 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt @@ -105,6 +105,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() } set(value) { set("widgetConfigs", value); mWidgetConfigs = value } + private var mArchiverEnabled: Boolean? = null + var archiverEnabled: Boolean + get() { mArchiverEnabled = mArchiverEnabled ?: values.get("archiverEnabled", true); return mArchiverEnabled ?: true } + set(value) { set("archiverEnabled", value); mArchiverEnabled = value } + private var rawEntries: List = db.configDao().getAllNow() private val profileConfigs: HashMap = hashMapOf() init { 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 b15b6408..c6d7ac07 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.MTIzNDU2Nzg5MDL9U0lwJn===.$param2".sha256() + return "$param1.MTIzNDU2Nzg5MD5LwH9bSc===.$param2".sha256() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt index 997e845b..9e52dc81 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt @@ -103,7 +103,9 @@ open class Profile( dateSemester2Start.year -= diff dateYearEnd.year -= diff } - return Date.getToday() >= dateYearEnd && Date.getToday().year > studentSchoolYearStart + return App.config.archiverEnabled + && Date.getToday() >= dateYearEnd + && Date.getToday().year > studentSchoolYearStart } fun isBeforeYear() = false && Date.getToday() < dateSemester1Start diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt index 72b9f9f5..c6fbcbc6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt @@ -45,6 +45,8 @@ class LabPageFragment : LazyFragment(), CoroutineScope { } override fun onPageCreated(): Boolean { + b.app = app + b.last10unseen.onClick { launch(Dispatchers.Default) { val events = app.db.eventDao().getAllNow(App.profileId) diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml index b023e11c..356c11c0 100644 --- a/app/src/main/res/layout/lab_fragment.xml +++ b/app/src/main/res/layout/lab_fragment.xml @@ -7,6 +7,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="HardcodedText"> + + + + @@ -74,6 +78,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" /> + + diff --git a/build.gradle b/build.gradle index 54a6a31b..c1279034 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { kotlin_version = '1.4.30' release = [ - versionName: "4.5-beta.2", - versionCode: 4050002 + versionName: "4.5", + versionCode: 4050099 ] setup = [