From a50dfb3ea741c7740aee43efda34bb13168728c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Fri, 16 Nov 2018 01:48:03 +0100 Subject: [PATCH 1/4] Fix snp app link after uonet upgrade --- api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt b/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt index 6f6b1490..2b8a3700 100644 --- a/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt +++ b/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt @@ -13,7 +13,7 @@ class StartPage(val client: Client) { fun getSchools(startPage: Document): MutableList { val schoolList = mutableListOf() - val snpLinks = startPage.select(".panel.linkownia.pracownik.klient a") + val snpLinks = startPage.select(".panel.linkownia.pracownik.klient .appLink a") logger.debug("SnP links: {}", snpLinks.size) From b39b9f8bba0f43661474371dc046988fd3390c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Fri, 16 Nov 2018 02:02:24 +0100 Subject: [PATCH 2/4] Fix tests --- .../io/github/wulkanowy/api/Start-multi.html | 18 ++++++++++-------- .../io/github/wulkanowy/api/Start-std.html | 14 ++++++++------ .../wulkanowy/api/login/Logowanie-success.html | 14 ++++++++------ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/api/src/test/resources/io/github/wulkanowy/api/Start-multi.html b/api/src/test/resources/io/github/wulkanowy/api/Start-multi.html index 98d385ee..d5323677 100644 --- a/api/src/test/resources/io/github/wulkanowy/api/Start-multi.html +++ b/api/src/test/resources/io/github/wulkanowy/api/Start-multi.html @@ -10,14 +10,16 @@
diff --git a/api/src/test/resources/io/github/wulkanowy/api/Start-std.html b/api/src/test/resources/io/github/wulkanowy/api/Start-std.html index 574bd9b9..b65625cf 100644 --- a/api/src/test/resources/io/github/wulkanowy/api/Start-std.html +++ b/api/src/test/resources/io/github/wulkanowy/api/Start-std.html @@ -9,13 +9,15 @@
- -
-
diff --git a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html index f35e6866..b635388b 100644 --- a/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html +++ b/api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html @@ -14,13 +14,15 @@
- -
-
From 78add470bab419ca125e0147c75463bd10c3edee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sat, 17 Nov 2018 14:02:40 +0100 Subject: [PATCH 3/4] Provide back-compatibility in school discover --- .../io/github/wulkanowy/api/login/StartPage.kt | 11 ++++++----- .../github/wulkanowy/api/login/StartPageTest.kt | 6 +++--- .../io/github/wulkanowy/api/Start-std.html | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt b/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt index 2b8a3700..57463a08 100644 --- a/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt +++ b/api/src/main/java/io/github/wulkanowy/api/login/StartPage.kt @@ -5,6 +5,7 @@ import io.github.wulkanowy.api.VulcanException import io.github.wulkanowy.api.generic.School import org.jsoup.nodes.Document import org.slf4j.LoggerFactory +import java.net.URL class StartPage(val client: Client) { @@ -13,7 +14,7 @@ class StartPage(val client: Client) { fun getSchools(startPage: Document): MutableList { val schoolList = mutableListOf() - val snpLinks = startPage.select(".panel.linkownia.pracownik.klient .appLink a") + val snpLinks = startPage.select(".panel.linkownia.pracownik.klient a[href*=\"uonetplus-opiekun\"]") logger.debug("SnP links: {}", snpLinks.size) @@ -24,7 +25,7 @@ class StartPage(val client: Client) { snpLinks.map { schoolList.add(School( it.text(), - getExtractedIdFromUrl(it.attr("href")), + getExtractedSchoolSymbolFromUrl(it.attr("href")), it == snpLinks.first() )) } @@ -32,10 +33,10 @@ class StartPage(val client: Client) { return schoolList } - internal fun getExtractedIdFromUrl(snpPageUrl: String): String { - val path = snpPageUrl.split(client.host).getOrNull(1)?.split("/") + internal fun getExtractedSchoolSymbolFromUrl(snpPageUrl: String): String { + val path = URL(snpPageUrl).path.split("/") - if (6 != path?.size) { + if (6 != path.size) { logger.error("Expected snp url, got {}", snpPageUrl) throw VulcanException("Na pewno używasz konta z dostępem do Witryny ucznia i rodzica?") } diff --git a/api/src/test/java/io/github/wulkanowy/api/login/StartPageTest.kt b/api/src/test/java/io/github/wulkanowy/api/login/StartPageTest.kt index 271b3bb0..fb2bf00c 100644 --- a/api/src/test/java/io/github/wulkanowy/api/login/StartPageTest.kt +++ b/api/src/test/java/io/github/wulkanowy/api/login/StartPageTest.kt @@ -51,18 +51,18 @@ class StartPageTest { @Test fun getExtractedIDStandardTest() { assertEquals("123456", StartPage(client) - .getExtractedIdFromUrl("https://uonetplus-opiekun.fakelog.cf/powiat/123456/Start/Index/")) + .getExtractedSchoolSymbolFromUrl("https://uonetplus-opiekun.fakelog.cf/powiat/123456/Start/Index/")) } @Test fun getExtractedIDDemoTest() { assertEquals("demo12345", StartPage(client) - .getExtractedIdFromUrl("https://uonetplus-opiekun.fakelog.cf/demoupowiat/demo12345/Start/Index/")) + .getExtractedSchoolSymbolFromUrl("https://uonetplus-opiekun.fakelog.cf/demoupowiat/demo12345/Start/Index/")) } @Test(expected = VulcanException::class) fun getExtractedIDNotLoggedTest() { assertEquals("123", StartPage(client) - .getExtractedIdFromUrl("https://uonetplus.NOTfakelog.cf/powiat/")) + .getExtractedSchoolSymbolFromUrl("https://uonetplus.NOTfakelog.cf/powiat/")) } } diff --git a/api/src/test/resources/io/github/wulkanowy/api/Start-std.html b/api/src/test/resources/io/github/wulkanowy/api/Start-std.html index b65625cf..2cf03d63 100644 --- a/api/src/test/resources/io/github/wulkanowy/api/Start-std.html +++ b/api/src/test/resources/io/github/wulkanowy/api/Start-std.html @@ -10,14 +10,25 @@
- +
-
+
Uczeń
+
+
+ +
+
+
Uczeń
+
+
+ +
+
From 78849f0280f28e4c50e3cfa2dbf211401e5366f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sat, 17 Nov 2018 14:07:23 +0100 Subject: [PATCH 4/4] Version 0.5.4 --- .gitignore | 4 ++-- app/build.gradle | 4 ++-- app/src/main/play/pl-PL/whatsnew | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8ad04ebf..4f2819d4 100644 --- a/.gitignore +++ b/.gitignore @@ -46,5 +46,5 @@ ehthumbs.db Thumbs.db .idea/codeStyles/ .idea/caches/ -./app/key.p12 -./app/upload-key.jks +app/key.p12 +app/upload-key.jks diff --git a/app/build.gradle b/app/build.gradle index 77934331..8a0abe3b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,8 +43,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 15 targetSdkVersion 27 - versionCode 16 - versionName "0.5.2" + versionCode 18 + versionName "0.5.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true playAccountConfig = playAccountConfigs.defaultAccountConfig diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew index ff412b22..205817c5 100644 --- a/app/src/main/play/pl-PL/whatsnew +++ b/app/src/main/play/pl-PL/whatsnew @@ -1,5 +1,2 @@ -Wersja 0.5.1: -- dodano wagę ocen na liście -- naprawiono błędy podczas logowania -- zmieniono nasycenie kolorów ocen -- wyłączenie synchronizacji podczas wakacji +Wersja 0.5.4: +- naprawiono błąd logowania