diff --git a/.nvmrc b/.nvmrc index 2bd5a0a..ce62013 100755 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22 +24.22.1 diff --git a/PLAYSTORE_REVIEW.md b/PLAYSTORE_REVIEW.md new file mode 100644 index 0000000..765c5aa --- /dev/null +++ b/PLAYSTORE_REVIEW.md @@ -0,0 +1,32 @@ +# Google Play: Zugang für die App-Prüfung + +In der Play Console unter **Richtlinien und Programme → App-Inhalte → App-Zugriff / Anmeldedaten** angeben, dass einige Funktionen eine Anmeldung erfordern. Eine neue Anleitung mit Titel `Harheimer TC review account` anlegen. + +## Konto auf dem Backend der eingereichten App einrichten + +Nach Deployment dieser Änderungen im Projektverzeichnis des entsprechenden Servers ausführen: + +```bash +node scripts/setup-playstore-review.js +``` + +Das Skript liest die dortige `.env` einschließlich `ENCRYPTION_KEY`, sichert die bisherige Benutzerdatei und erstellt ein aktives, ausgeblendetes Mitgliedskonto. Standardadresse: `playstore-review@harheimertc.invalid`. Dies ist bewusst kein echtes Postfach. Das zufällig erzeugte Passwort wird einmal ausgegeben und muss sicher abgelegt werden. Bei erneutem Aufruf bleibt es unverändert. Optional können `PLAYSTORE_REVIEW_EMAIL` und `PLAYSTORE_REVIEW_PASSWORD` gesetzt werden; ein explizites Passwort aktualisiert das bestehende Review-Konto. Kein reguläres Konto wird umgewandelt. + +In der Play Console die ausgegebene E-Mail-Adresse und das Passwort eintragen. Zusätzliche Anweisungen auf Englisch: + +> Open the app and go to Login. Sign in with the email address and password provided above. This account is already activated and provides access to the member features. No registration, email verification, one-time code or approval is required. Please stay signed in while testing forms. Outgoing emails triggered by this account are suppressed by the server. When a form asks for an email address, use the review account email provided above, including when testing while signed out. + +Die Zugangsdaten dauerhaft gültig halten. Das Konto ist ein Mitglied, kein CMS-Administrator. + +## Versandsperre + +Alle SMTP-Versandstellen verwenden dieselbe serverseitige Sperre: + +- Für authentifizierte Konten mit `accountType: playstore_review` oder der konfigurierten `PLAYSTORE_REVIEW_EMAIL` wird kein SMTP-Versand ausgeführt, auch bei abweichender Formularadresse. +- Mails an die Review-Adresse sowie Kontaktmails mit dieser Antwortadresse werden auch ohne Anmeldung unterdrückt. Registrierung und Mitgliedsanträge prüfen zusätzlich die Formularadresse. Gemischte Empfängerlisten mit einem Review-Konto werden vollständig unterdrückt. +- `MAIL_DELIVERY_DISABLED=true` unterdrückt sämtliche SMTP-Mails einer Installation. Die PM2-Testkonfiguration setzt dies standardmäßig; Produktion bleibt ohne diese Einstellung aktiv. Nach Konfigurationsänderungen den Backend-Prozess mit aktualisierter Umgebung neu starten. +- `DEBUG=true` allein verhindert keinen Mailversand. + +Die Versandsperre ist keine isolierte Demo-Datenbank: Formulare können weiterhin Daten speichern und Push-Benachrichtigungen auslösen. Ohne Anmeldung und mit einer fremden Formularadresse lässt sich eine Anfrage keinem Review-Konto zuordnen. Für vollständig mailfreie Tests daher eine separate Testinstanz mit `MAIL_DELIVERY_DISABLED=true` verwenden und sicherstellen, dass der eingereichte App-Build dieses Backend nutzt. + +Google-Anforderungen: https://support.google.com/googleplay/android-developer/answer/15748846 diff --git a/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt b/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt index 9656b2e..22d4b18 100755 --- a/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt +++ b/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt @@ -88,13 +88,12 @@ class NotificationPreferencesRepository @Inject constructor( } suspend fun saveRemote(settings: NotificationPreferences): Result { - saveLocal(settings) return runCatching { retryOnNetworkFailure { val response = api.updateNotificationSettings(settings.toDto()) if (!response.isSuccessful) error("Benachrichtigungseinstellungen konnten nicht gespeichert werden.") val saved = response.body()?.settings?.toPreferences() ?: error("Leere Antwort") - saveLocal(saved) + requireLiveNotificationSettingsSaved(settings, saved) saved } } @@ -120,6 +119,15 @@ class NotificationPreferencesRepository @Inject constructor( } } +internal fun requireLiveNotificationSettingsSaved(requested: NotificationPreferences, saved: NotificationPreferences) { + if (requested.liveTickerStarts != saved.liveTickerStarts || + requested.liveTickerScoreChanges != saved.liveTickerScoreChanges || + requested.liveTickerFinished != saved.liveTickerFinished + ) { + error("Der Server hat die Live-Benachrichtigungen nicht übernommen. Bitte das Backend aktualisieren und erneut versuchen.") + } +} + private fun NotificationSettingsDto.toPreferences(): NotificationPreferences = NotificationPreferences( newNews = newNews, newEvents = newEvents, diff --git a/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt b/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt index 9c76bb8..40c6780 100755 --- a/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt +++ b/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt @@ -80,8 +80,8 @@ private fun CompactNavigation( navigationState: NavigationUiState = NavigationUiState(), ) { val routeSection = menuSection(selectedRoute) - val sectionOverride = androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(null) } - val section = routeSection ?: sectionOverride.value + val sectionOverride = androidx.compose.runtime.remember(selectedRoute) { androidx.compose.runtime.mutableStateOf(null) } + val section = sectionOverride.value ?: routeSection val subItems = submenu(section, navigationState) val mainScroll = rememberScrollState() diff --git a/android-app/app/src/main/java/de/harheimertc/ui/components/LiveTickerBanner.kt b/android-app/app/src/main/java/de/harheimertc/ui/components/LiveTickerBanner.kt index 0243fe7..b6d2ec2 100644 --- a/android-app/app/src/main/java/de/harheimertc/ui/components/LiveTickerBanner.kt +++ b/android-app/app/src/main/java/de/harheimertc/ui/components/LiveTickerBanner.kt @@ -1,25 +1,40 @@ package de.harheimertc.ui.components -import androidx.compose.foundation.horizontalScroll +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier +import androidx.compose.ui.Alignment +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import de.harheimertc.data.LiveTickerMatchDto +import kotlinx.coroutines.isActive @Composable fun LiveTickerBanner(matches: List, loaded: Boolean) { @@ -45,34 +60,78 @@ fun LiveTickerBanner(matches: List, loaded: Boolean) { if (matches.isEmpty()) return + var paused by remember { mutableStateOf(false) } Surface(color = Color(0xFFEAF8F8), modifier = Modifier.fillMaxWidth()) { - Row( - modifier = Modifier - .horizontalScroll(rememberScrollState()) - .padding(horizontal = 16.dp, vertical = 9.dp), - ) { - matches.forEachIndexed { index, match -> - if (index > 0) { - Text(" • ", color = Color(0xFF64748B)) + Row(verticalAlignment = Alignment.CenterVertically) { + TextButton( + onClick = { paused = !paused }, + modifier = Modifier.semantics { + contentDescription = if (paused) "Laufschrift fortsetzen" else "Laufschrift anhalten" + }, + ) { + Text(if (paused) "▶" else "Ⅱ", color = Color(0xFF334155)) + } + BoxWithConstraints(modifier = Modifier.weight(1f).clipToBounds()) { + val viewportWidth = maxWidth + var groupWidth by remember { mutableStateOf(0) } + val offset = remember { Animatable(0f) } + val pixelsPerSecond = with(LocalDensity.current) { 36.dp.toPx() } + LaunchedEffect(groupWidth, pixelsPerSecond, paused) { + if (groupWidth <= 0 || paused) return@LaunchedEffect + offset.snapTo(offset.value % groupWidth) + while (isActive) { + val duration = ((groupWidth - offset.value) / pixelsPerSecond * 1000).toInt().coerceAtLeast(1) + offset.animateTo(groupWidth.toFloat(), tween(duration, easing = LinearEasing)) + offset.snapTo(0f) + // Also yield when system animations are disabled. + withFrameNanos { } + } } - val status = when { - match.completed -> "✓ beendet" - match.hasLiveData -> "● LIVE" - else -> "◌ Keine Live-Daten" + Row( + modifier = Modifier + .wrapContentWidth(Alignment.Start, unbounded = true) + .graphicsLayer { translationX = -offset.value }, + ) { + repeat(2) { copy -> + LiveTickerGroup( + matches = matches, + modifier = Modifier + .widthIn(min = viewportWidth) + .then(if (copy == 0) Modifier.onSizeChanged { groupWidth = it.width } else Modifier.clearAndSetSemantics {}), + ) + } } - Text( - text = "$status ${match.homeTeam} – ${match.awayTeam} ${match.score}", - color = when { - match.completed -> Color(0xFF64748B) - match.hasLiveData -> Color(0xFFB91C1C) - else -> Color(0xFF334155) - }, - style = MaterialTheme.typography.labelLarge, - fontWeight = if (match.completed) FontWeight.Normal else FontWeight.SemiBold, - fontStyle = if (match.completed) FontStyle.Italic else FontStyle.Normal, - maxLines = 1, - ) } } } } + +@Composable +private fun LiveTickerGroup(matches: List, modifier: Modifier = Modifier) { + Row( + modifier = modifier.padding(start = 16.dp, end = 32.dp, top = 9.dp, bottom = 9.dp), + ) { + matches.forEachIndexed { index, match -> + if (index > 0) { + Text(" • ", color = Color(0xFF64748B)) + } + val status = when { + match.completed -> "✓ beendet" + match.hasLiveData -> "● LIVE" + else -> "◌ Keine Live-Daten" + } + Text( + text = "$status ${match.homeTeam} – ${match.awayTeam} ${match.score}", + color = when { + match.completed -> Color(0xFF64748B) + match.hasLiveData -> Color(0xFFB91C1C) + else -> Color(0xFF334155) + }, + style = MaterialTheme.typography.labelLarge, + fontWeight = if (match.completed) FontWeight.Normal else FontWeight.SemiBold, + fontStyle = if (match.completed) FontStyle.Italic else FontStyle.Normal, + maxLines = 1, + ) + } + } +} diff --git a/android-app/app/src/main/java/de/harheimertc/ui/navigation/NavGraph.kt b/android-app/app/src/main/java/de/harheimertc/ui/navigation/NavGraph.kt index 4d6f3e1..a618ba5 100755 --- a/android-app/app/src/main/java/de/harheimertc/ui/navigation/NavGraph.kt +++ b/android-app/app/src/main/java/de/harheimertc/ui/navigation/NavGraph.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -45,13 +46,13 @@ fun NavGraph( LaunchedEffect(currentRoute) { navigationViewModel.refreshSession() } - LaunchedEffect(currentRoute, navigationState.loggedIn) { - navigationViewModel.setLiveTickerActive( - navigationState.loggedIn && (currentRoute == "intern" || currentRoute?.startsWith("intern/") == true || currentRoute == "cms" || currentRoute?.startsWith("cms/") == true), - ) + LaunchedEffect(navigationState.loggedIn) { + navigationViewModel.setLiveTickerActive(navigationState.loggedIn) } - BoxWithConstraints(modifier = Modifier.fillMaxSize()) { - val persistentNavigation = maxWidth >= 600.dp + BoxWithConstraints(modifier = Modifier.fillMaxSize().systemBarsPadding()) { + val tabletNavigation = maxWidth >= 600.dp + // Signed-in phones share the same menu and ticker above every screen. + val persistentNavigation = tabletNavigation || navigationState.loggedIn Column(modifier = Modifier.fillMaxSize()) { navigationState.connectionNote?.let { message -> Surface(color = Color(0xFFFFF4E5), modifier = Modifier.fillMaxWidth()) { @@ -74,14 +75,16 @@ fun NavGraph( } } }, - webTabletNavigation = true, + webTabletNavigation = tabletNavigation, navigationState = navigationState, ) } - LiveTickerBanner( - matches = navigationState.liveTickerMatches, - loaded = navigationState.liveTickerLoaded, - ) + if (navigationState.loggedIn) { + LiveTickerBanner( + matches = navigationState.liveTickerMatches, + loaded = navigationState.liveTickerLoaded, + ) + } NavHost( navController = navController, startDestination = startDestination, diff --git a/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt b/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt index f4a3f99..4942a5f 100755 --- a/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt +++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt @@ -210,7 +210,10 @@ fun NotificationSettingsScreen( } state.saveError?.let { message -> - item { Text(message, color = MaterialTheme.colorScheme.error) } + item { + Text(message, color = MaterialTheme.colorScheme.error) + TextButton(onClick = { viewModel.update(state.settings) }) { Text("Erneut speichern") } + } } state.error?.let { message -> diff --git a/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModel.kt b/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModel.kt index 906a22f..f91a802 100755 --- a/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModel.kt +++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModel.kt @@ -12,6 +12,8 @@ import de.harheimertc.repositories.PushTokenRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock import javax.inject.Inject data class NotificationSettingsUiState( @@ -37,6 +39,8 @@ class NotificationSettingsViewModel @Inject constructor( ) : ViewModel() { private val _state = MutableStateFlow(NotificationSettingsUiState()) val state: StateFlow = _state + private val saveMutex = Mutex() + private var settingsRevision = 0L init { load() @@ -66,14 +70,21 @@ class NotificationSettingsViewModel @Inject constructor( } fun update(settings: NotificationPreferences) { + val revision = ++settingsRevision preferencesRepository.saveLocal(settings) _state.value = _state.value.copy(settings = settings, saveError = null) viewModelScope.launch { - preferencesRepository.saveRemote(settings) - .onSuccess { saved -> _state.value = _state.value.copy(settings = saved, saveError = null) } - .onFailure { error -> + saveMutex.withLock { + if (revision != settingsRevision) return@withLock + val result = preferencesRepository.saveRemote(settings) + if (revision != settingsRevision) return@withLock + result.onSuccess { saved -> + preferencesRepository.saveLocal(saved) + _state.value = _state.value.copy(settings = saved, saveError = null) + }.onFailure { error -> _state.value = _state.value.copy(saveError = error.message ?: "Benachrichtigungseinstellungen konnten nicht gespeichert werden.") } + } } } diff --git a/android-app/app/src/test/java/de/harheimertc/ui/screens/login/LoginViewModelTest.kt b/android-app/app/src/test/java/de/harheimertc/ui/screens/login/LoginViewModelTest.kt index a2412e6..536e5ae 100755 --- a/android-app/app/src/test/java/de/harheimertc/ui/screens/login/LoginViewModelTest.kt +++ b/android-app/app/src/test/java/de/harheimertc/ui/screens/login/LoginViewModelTest.kt @@ -38,7 +38,7 @@ class LoginViewModelTest { val repo = mockk() val passkeyRepo = mockk() coEvery { repo.status() } returns Result.success(de.harheimertc.data.AuthStatusResponse()) - val vm = LoginViewModel(repo, passkeyRepo) + val vm = LoginViewModel(repo, passkeyRepo, mockk(relaxed = true)) vm.setEmail("invalid-email") vm.setPassword("") @@ -57,7 +57,7 @@ class LoginViewModelTest { val passkeyRepo = mockk() coEvery { repo.login(any(), any()) } returns Result.success(loginResp) coEvery { repo.status() } returns Result.success(de.harheimertc.data.AuthStatusResponse()) - val vm = LoginViewModel(repo, passkeyRepo) + val vm = LoginViewModel(repo, passkeyRepo, mockk(relaxed = true)) vm.setEmail("max@ex.de") vm.setPassword("secret") diff --git a/android-app/app/src/test/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModelTest.kt b/android-app/app/src/test/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModelTest.kt new file mode 100644 index 0000000..aca748f --- /dev/null +++ b/android-app/app/src/test/java/de/harheimertc/ui/screens/notifications/NotificationSettingsViewModelTest.kt @@ -0,0 +1,96 @@ +package de.harheimertc.ui.screens.notifications + +import de.harheimertc.data.AuthStatusResponse +import de.harheimertc.repositories.LoginRepository +import de.harheimertc.repositories.MannschaftenRepository +import de.harheimertc.repositories.NotificationPreferences +import de.harheimertc.repositories.NotificationPreferencesRepository +import de.harheimertc.repositories.PushTokenRepository +import de.harheimertc.repositories.requireLiveNotificationSettingsSaved +import io.mockk.coEvery +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.resetMain +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import kotlinx.coroutines.test.setMain +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test + +@OptIn(ExperimentalCoroutinesApi::class) +class NotificationSettingsViewModelTest { + private val dispatcher = StandardTestDispatcher() + private val preferences = mockk(relaxed = true) + private val teams = mockk() + private val login = mockk() + + @Before + fun setUp() { + Dispatchers.setMain(dispatcher) + every { preferences.loadLocal() } returns NotificationPreferences() + coEvery { preferences.loadRemote() } returns Result.success(NotificationPreferences()) + coEvery { login.status() } returns Result.success(AuthStatusResponse()) + coEvery { teams.fetchSeasons() } returns Result.failure(IllegalStateException("offline")) + coEvery { teams.fetchMannschaften(any()) } returns Result.success(emptyList()) + } + + @After + fun tearDown() { + Dispatchers.resetMain() + } + + private fun viewModel() = NotificationSettingsViewModel(preferences, teams, login, mockk()) + + @Test + fun olderResponseCannotUndoNewerSwitches() = runTest(dispatcher) { + val firstResponse = CompletableDeferred>() + val first = NotificationPreferences(liveTickerStarts = true) + val latest = first.copy(liveTickerScoreChanges = true, liveTickerFinished = true) + coEvery { preferences.saveRemote(first) } coAnswers { firstResponse.await() } + coEvery { preferences.saveRemote(latest) } returns Result.success(latest) + val vm = viewModel() + runCurrent() + vm.update(first) + runCurrent() + vm.update(latest) + runCurrent() + firstResponse.complete(Result.success(first)) + runCurrent() + assertEquals(latest, vm.state.value.settings) + verify(exactly = 1) { preferences.saveLocal(first) } + verify(atLeast = 1) { preferences.saveLocal(latest) } + } + + @Test + fun rejectedLiveSettingsStayVisibleWithSaveError() = runTest(dispatcher) { + val requested = NotificationPreferences(liveTickerFinished = true) + coEvery { preferences.saveRemote(requested) } returns Result.failure(IllegalStateException("Backend aktualisieren")) + val vm = viewModel() + runCurrent() + vm.update(requested) + runCurrent() + assertTrue(vm.state.value.settings.liveTickerFinished) + assertEquals("Backend aktualisieren", vm.state.value.saveError) + } + + @Test + fun serverMustConfirmEachLivePreference() { + val defaults = NotificationPreferences() + for (requested in listOf( + defaults.copy(liveTickerStarts = true), + defaults.copy(liveTickerScoreChanges = true), + defaults.copy(liveTickerFinished = true), + )) { + val error = runCatching { requireLiveNotificationSettingsSaved(requested, defaults) }.exceptionOrNull() + assertTrue(error?.message.orEmpty().contains("Server")) + requireLiveNotificationSettingsSaved(requested, requested) + } + } +} diff --git a/android-app/gradle.properties b/android-app/gradle.properties index 9b70bac..27cfdc4 100755 --- a/android-app/gradle.properties +++ b/android-app/gradle.properties @@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/ PRODUCTION_API_BASE_URL=https://harheimertc.de/ # Android app versioning for Play Store uploads -ANDROID_VERSION_CODE=38 -ANDROID_VERSION_NAME=0.11.0 +ANDROID_VERSION_CODE=40 +ANDROID_VERSION_NAME=0.11.2 # Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping. RELEASE_MINIFY_ENABLED=false diff --git a/app.vue b/app.vue index 6493c6b..a0c43e1 100755 --- a/app.vue +++ b/app.vue @@ -1,8 +1,8 @@