From 6c8b0dc527a9b6e9bb3a5c36b9519dce735c7507 Mon Sep 17 00:00:00 2001
From: Odweta <code.62rdl@aleeas.com>
Date: Fri, 8 Mar 2024 18:15:25 +0100
Subject: [PATCH] fixed app crash (buffer overflow)

---
 mobile/.idea/codeStyles/Project.xml           | 123 ++++++++++++++++++
 mobile/.idea/codeStyles/codeStyleConfig.xml   |   5 +
 mobile/.idea/gradle.xml                       |   2 +-
 mobile/.idea/migrations.xml                   |  10 ++
 .../java/com/odweta/solon/CalWeekFragment.kt  |   1 -
 .../src/main/java/com/odweta/solon/Parsing.kt |  22 ++--
 mobile/build.gradle.kts                       |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 8 files changed, 155 insertions(+), 12 deletions(-)
 create mode 100644 mobile/.idea/codeStyles/Project.xml
 create mode 100644 mobile/.idea/codeStyles/codeStyleConfig.xml
 create mode 100644 mobile/.idea/migrations.xml

diff --git a/mobile/.idea/codeStyles/Project.xml b/mobile/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/mobile/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/mobile/.idea/codeStyles/codeStyleConfig.xml b/mobile/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/mobile/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/mobile/.idea/gradle.xml b/mobile/.idea/gradle.xml
index 8e78a60..0897082 100644
--- a/mobile/.idea/gradle.xml
+++ b/mobile/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/mobile/.idea/migrations.xml b/mobile/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/mobile/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt
index 6ba4c3b..5de4f71 100644
--- a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt
@@ -58,7 +58,6 @@ class CalWeekFragment : Fragment() {
                 super.onPageSelected(position)
                 if (viewPager.isLaidOut) {
                     Vars.selectedDay = position
-                    Log.d("debug", Vars.selectedDay.toString())
                 }
             }
         })
diff --git a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt
index 3baa2db..790f62a 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt
@@ -1,5 +1,6 @@
 package com.odweta.solon
 
+import android.util.Log
 import org.json.JSONObject
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -110,15 +111,17 @@ class Parsing {
                 }
 
                 for (subj in subjectJSONList) {
+                    Log.d("debug", subj.toString())
                     // for each subject in one particular day
                     val subject = Subject()
                     val kind = subj.getJSONObject("hourKind").get("id")
                     val type = subj.getJSONObject("hourType").get("id")
 
-                    if (
-                        (type == "SUPLOVANA") ||
-                        (type != "SUPLOVANI" && type != "ROZVRH")
-                    ) {
+                    if (type == "SUPLOVANA") {
+                        continue
+                    }
+
+                    if (type != "SUPLOVANI" && type != "ROZVRH") {
                         when (kind) {
                             "ZRUSENI_VYUKY_ROZVRH" -> {
                                 subject.name = subj.get("title").toString()
@@ -232,14 +235,17 @@ class Parsing {
                         } else {
                             auxSubjects.add(subjects[i])
 
-                            while ((auxSubjects[auxSubjects.size - 1].number.toInt() + 1).toString() != subjects[i + 1].number) {
+                            var previous = auxSubjects[auxSubjects.size - 1].number.toInt() + 1
+                            val next = subjects[i + 1].number.toInt()
+                            while (previous < next) {
                                 auxSubjects.add(
                                     Subject.freeSubject(
-                                        (auxSubjects[auxSubjects.size - 1].number.toInt() + 1).toString(),
-                                        "",
-                                        ""
+                                        previous.toString(),
+                                        subjects[i-1].end,
+                                        subjects[i+1].start
                                     )
                                 )
+                                previous += 1
                             }
                         }
                     }
diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 53f4a67..31ed43c 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.2" apply false
+    id("com.android.application") version "8.3.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }
\ No newline at end of file
diff --git a/mobile/gradle/wrapper/gradle-wrapper.properties b/mobile/gradle/wrapper/gradle-wrapper.properties
index 627f0bc..ece3c89 100644
--- a/mobile/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jan 07 18:04:36 GMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists