Merge pull request #406 from jaro-jaro/404-aktualizace-jr-se-nabizi-2x

#404 Aktualizace JŘ se nabízela 2x
jaro-jaro · Apr 21, 2024 · f27e1bc · f27e1bc
2 parents ba88ec5 + 0e452d6
commit f27e1bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "cz.jaro.dpmcb"
         minSdk = 26
         targetSdk = 34
-        versionCode = 13
-        versionName = "1.6.1-RC.2"
+        versionCode = 14
+        versionName = "1.6.1-RC.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt b/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt
@@ -456,18 +456,14 @@ class LoadingViewModel(
         println(connStops)
         println(timeCodes)
 
-        coroutineScope {
-            launch {
-                repo.write(
-                    connStops = connStops.distinctBy { Triple(it.tab, it.connNumber, it.stopIndexOnLine) }.toTypedArray(),
-                    stops = stops.distinctBy { it.tab to it.stopNumber }.toTypedArray(),
-                    timeCodes = timeCodes.distinctBy { Quadruple(it.tab, it.code, it.connNumber, it.termIndex) }.toTypedArray(),
-                    lines = lines.distinctBy { it.tab }.toTypedArray(),
-                    conns = conns.distinctBy { it.tab to it.connNumber }.toTypedArray(),
-                    version = newVersion,
-                )
-            }.join()
-        }
+        repo.write(
+            connStops = connStops.distinctBy { Triple(it.tab, it.connNumber, it.stopIndexOnLine) }.toTypedArray(),
+            stops = stops.distinctBy { it.tab to it.stopNumber }.toTypedArray(),
+            timeCodes = timeCodes.distinctBy { Quadruple(it.tab, it.code, it.connNumber, it.termIndex) }.toTypedArray(),
+            lines = lines.distinctBy { it.tab }.toTypedArray(),
+            conns = conns.distinctBy { it.tab to it.connNumber }.toTypedArray(),
+            version = newVersion,
+        )
     }
 
     private suspend fun downloadDiagram(schemaRef: StorageReference) = downloadFile(schemaRef, params.diagramFile)

diff --git a/app/version.txt b/app/version.txt
@@ -1 +1 @@
-1.6.1-RC.2
+1.6.1-RC.3