From 93bc4e92a9570d3aa55edaeadbdc3ad14f45d243 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 9 Dec 2020 15:38:06 +0000 Subject: [PATCH 1/5] Bump kotlin_version from 1.4.20 to 1.4.21 (#1047) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a68efccde..6e30851d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.4.20' + kotlin_version = '1.4.21' about_libraries = '8.6.3' hilt_version = "2.30.1-alpha" } From 1680ad233e1d6ddbb308a8b559ab2cbb3fa2e054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Thu, 10 Dec 2020 21:12:14 +0100 Subject: [PATCH 2/5] New translations strings.xml (Czech) (#1049) --- app/src/main/res/values-cs-rCZ/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 3769b8511..6ddc561d6 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -98,8 +98,8 @@ %d známka %d známky - %d známky - %d známky + %d známek + %d známek Nová známka @@ -291,7 +291,7 @@ Máte %1$d nové neutrální pozornosti - Žádné informace o domácím úkolu + Žádné informace o domácích úkolech Označit jako hotové Neudělané Přílohy From 3eba89aeb97ac5a02332745a02e309604193e85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Thu, 10 Dec 2020 21:12:59 +0100 Subject: [PATCH 3/5] Disable recordException in HMS (#1048) --- .../hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt index 60588f63c..b5fb6ad71 100644 --- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt +++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt @@ -3,7 +3,6 @@ package io.github.wulkanowy.utils import android.util.Log import com.huawei.agconnect.crash.AGConnectCrash import fr.bipi.tressence.base.FormatterPriorityTree -import fr.bipi.tressence.common.StackTraceRecorder import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException import java.io.InterruptedIOException @@ -39,7 +38,9 @@ class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) { override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { if (skipLog(priority, tag, message, t)) return - connectCrash.setCustomKey("priority", priority) + // Disabled due to a bug in the Huawei library + + /*connectCrash.setCustomKey("priority", priority) connectCrash.setCustomKey("tag", tag.orEmpty()) connectCrash.setCustomKey("message", message) @@ -47,6 +48,6 @@ class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) { connectCrash.recordException(t) } else { connectCrash.recordException(StackTraceRecorder(format(priority, tag, message))) - } + }*/ } } From 315e9b05954414f1b2e2384e270b0873e460f87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Wed, 16 Dec 2020 20:48:01 +0100 Subject: [PATCH 4/5] Fix username label on registers other than default (#1050) --- app/build.gradle | 2 +- .../wulkanowy/ui/modules/login/form/LoginFormPresenter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5cfdcb2c..be1e5c7ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -142,7 +142,7 @@ configurations.all { } dependencies { - implementation "io.github.wulkanowy:sdk:0.23.0" + implementation "io.github.wulkanowy:sdk:41b164fe" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt index 35c79bb5e..e165d264f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt @@ -57,7 +57,7 @@ class LoginFormPresenter @Inject constructor( fun updateUsernameLabel() { view?.run { - setUsernameLabel(if ("login" in formHostValue) nicknameLabel else emailLabel) + setUsernameLabel(if ("email" !in formHostValue) nicknameLabel else emailLabel) } } From 88c5c7d9dcd3e689c900e310eb9b3df7c0ea1a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Wed, 16 Dec 2020 21:19:47 +0100 Subject: [PATCH 5/5] Version 0.23.1 --- .travis.yml | 2 +- app/build.gradle | 6 +++--- app/src/main/play/release-notes/pl-PL/default.txt | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fb3df0c3..238fefdfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: branches: only: - develop - - 0.23.0 + - 0.23.1 android: licenses: diff --git a/app/build.gradle b/app/build.gradle index be1e5c7ae..89b5346ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 17 targetSdkVersion 30 - versionCode 76 - versionName "0.23.0" + versionCode 77 + versionName "0.23.1" multiDexEnabled true resValue "string", "app_name", "Wulkanowy" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -142,7 +142,7 @@ configurations.all { } dependencies { - implementation "io.github.wulkanowy:sdk:41b164fe" + implementation "io.github.wulkanowy:sdk:0.23.1" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt index 32bce4a96..908a97d53 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,7 +1,5 @@ -Wersja 0.23.0 -- naprawiliśmy logowanie do dziennika Gdańskiej i Koszalińskiej Platformy Edukacyjnej -- przy logowaniu odpowiednia odmiana dziennika jest ustawiana automatycznie na podstawie wpisanego adresu email -- dodaliśmy wyświetlanie średniej w ocenach klasy (jeśli włączone przez szkołę) -- dodaliśmy wyświetlanie zebrań +Wersja 0.23.1 +- naprawiliśmy opis pola na email/login przy wyborze niestandardowych dzienników +- naprawiliśmy obsługę dziennika lubelskiego i koszalińskiego na starszych urządzeniach (z Androidem 5 i starszymi) Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases