Version 0.5.4

.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

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<School> {
         val schoolList = mutableListOf<School>()
 
-        val snpLinks = startPage.select(".panel.linkownia.pracownik.klient 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?")
         }

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/"))
     }
 }

api/src/test/resources/io/github/wulkanowy/api/Start-multi.html

@@ -10,14 +10,16 @@
         <div class="content">
           <div class="panel linkownia pracownik klient">
             <div id="idAppUczen" class="subDiv">
-              <a href="https://uonetplus-opiekun.fakelog.cf/symbol/123456/Start/Index/">
-                <span class="header directLink">GIMBB</span>
-              </a>
-              <br>
-              <a href="https://uonetplus-opiekun.fakelog.cf/symbol/123457/Start/Index/">
-                <span class="header directLink">SPBB</span>
-              </a>
-              <br>
+              <div class="appLink">
+                <a href="https://uonetplus-opiekun.fakelog.cf/symbol/123456/Start/Index/">
+                  <span class="header directLink">GIMBB</span>
+                </a>
+                <br>
+                <a href="https://uonetplus-opiekun.fakelog.cf/symbol/123457/Start/Index/">
+                  <span class="header directLink">SPBB</span>
+                </a>
+                <br>
+              </div>
             </div>
           </div>
         </div>

api/src/test/resources/io/github/wulkanowy/api/Start-std.html

@@ -9,13 +9,26 @@
       <div class="holder">
         <div class="content">
           <div class="panel linkownia pracownik klient">
-            <a href="https://uonetplus-opiekun.fakelog.cf/symbol/534213/Start/Index/">
-              <div class="imagedHeader directLink">
-                <div id="idEmptyAppUczeń">
-                  <div class="name">Uczeń</div>
+            <div class="appLink">
+              <a href="http://uonetplus-opiekun.fakelog.localhost:3000/default/534213/Start/Index/">
+                <div class="imagedHeader directLink">
+                  <div id="idEmptyAppUczen">
+                    <div class="name">Uczeń</div>
+                  </div>
                 </div>
+              </a>
+            </div>
+            <div class="newAppLink">
+              <div class="link">
+                <a href="http://uonetplus-uczen.fakelog.localhost:3000/default/012345/">
+                  <div class="imagedHeader directLink">
+                    <div id="idEmptyAppUczenExt">
+                      <div class="name">Uczeń</div>
+                    </div>
+                  </div>
+                </a>
               </div>
-            </a>
+            </div>
           </div>
         </div>
       </div>

api/src/test/resources/io/github/wulkanowy/api/login/Logowanie-success.html

@@ -14,13 +14,15 @@
       <div class="holder">
         <div class="content">
           <div class="panel linkownia pracownik klient">
-            <a href="https://uonetplus-opiekun.fakelog.cf/symbol/534213/Start/Index/">
-              <div class="imagedHeader directLink">
-                <div id="idEmptyAppUczeń">
-                  <div class="name">Uczeń</div>
+            <div class="appLink">
+              <a href="https://uonetplus-opiekun.fakelog.cf/symbol/534213/Start/Index/">
+                <div class="imagedHeader directLink">
+                  <div id="idEmptyAppUczeń">
+                    <div class="name">Uczeń</div>
+                  </div>
                 </div>
-              </div>
-            </a>
+              </a>
+            </div>
           </div>
         </div>
       </div>

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

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