Merge pull request #417 from VPlanPlus-Project/train/v0.2.18-production

Train/v0.2.18 production

Author: Julius-Babies

composeApp/build.gradle.kts

@@ -5,8 +5,8 @@ import java.util.Base64
 import java.util.Properties
 
 object ApplicationConfig {
-    const val APP_VERSION_NAME = "0.2.17-production"
-    const val APP_VERSION_CODE = 227
+    const val APP_VERSION_NAME = "0.2.18-production"
+    const val APP_VERSION_CODE = 237
 }
 
 val localProperties = Properties().apply {

composeApp/src/commonMain/kotlin/plus/vplan/app/App.kt

@@ -49,7 +49,6 @@ const val APP_REDIRECT_URI = "vpp://app/auth/"
 val VPP_ID_AUTH_URL = URLBuilder(currentConfiguration.authUrl).apply {
     appendPathSegments("authorize")
     parameters.append("client_id", APP_ID)
-    parameters.append("client_secret", APP_SECRET)
     parameters.append("redirect_uri", APP_REDIRECT_URI)
     parameters.append("device_name", getSystemInfo().deviceName)
 }.buildString()

composeApp/src/commonMain/kotlin/plus/vplan/app/feature/settings/page/developer/timetable_debug/TimetableDebugScreen.kt

@@ -12,6 +12,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -92,20 +93,29 @@ private fun TimetableDebugContent(
                     .fillMaxWidth()
             ) {
                 state.weeks.forEach { week ->
-                    Text(
-                        text = "Woche KW ${week.week.calendarWeek} (SW ${week.week.weekIndex})"
-                    )
-                    week.timetableMetadata?.let {
+                    Column(
+                        modifier = Modifier.fillMaxWidth()
+                    ) {
                         Text(
-                            text = buildString {
-                                append(it.dataState.toString())
-                                append(" ")
-                                append(it.id.toHexDashString())
-                            },
-                            maxLines = 1,
-                            overflow = TextOverflow.Clip,
-                            modifier = Modifier.padding(start = 8.dp)
+                            text = "Woche KW ${week.week.calendarWeek} (SW ${week.week.weekIndex})"
                         )
+                        if (week.timetableMetadata == null) {
+                            Text(
+                                text = "No metadata available",
+                                color = MaterialTheme.colorScheme.outline
+                            )
+                        } else {
+                            Text(
+                                text = buildString {
+                                    append(week.timetableMetadata.dataState.toString())
+                                    append(" ")
+                                    append(week.timetableMetadata.id.toHexDashString())
+                                },
+                                maxLines = 1,
+                                overflow = TextOverflow.Clip,
+                                modifier = Modifier.padding(start = 8.dp)
+                            )
+                        }
                     }
 
                     HorizontalDivider(Modifier.padding(4.dp))

composeApp/src/commonMain/kotlin/plus/vplan/app/feature/sync/domain/usecase/sp24/UpdateTimetableUseCase.kt

@@ -77,7 +77,7 @@ class UpdateTimetableUseCase(
             }
 
         weeks.forEach forEachWeek@{ week ->
-            if (week.relativeTime == WeekState.RelativeTime.Past && !forceUpdate) return@forEachWeek
+            if ((week.relativeTime == WeekState.RelativeTime.Past && week.hasData != Stundenplan24Repository.HasData.Unknown) && !forceUpdate) return@forEachWeek
             if (week.hasData != Stundenplan24Repository.HasData.Yes || forceUpdate) {
                 LOGGER.d {
                     buildString {