Merge pull request 'dev' (#51) from dev into main

Reviewed-on: #51

.gitea/workflows/code-analysis.yml

@@ -6,13 +6,39 @@ on:
 
 jobs:
   analyze:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+        with:
+          clean: true
+          # Der Analyse-Workflow benötigt keine Historie. Ein flacher Checkout
+          # verhindert, dass der Runner das große Repository-Pack vollständig lädt.
+          fetch-depth: 1
+          # Der Web-Workflow braucht keine Android-Artefakte. Insbesondere liegt
+          # dort ein großer Heap-Dump im aktuellen Commit, der auch bei einem
+          # flachen Checkout übertragen würde und den Runner-Checkout abbricht.
+          sparse-checkout: |
+            /*
+            !/android-app/
+          sparse-checkout-cone-mode: false
+
+      - name: Ensure clean workspace
+        run: |
+          git reset --hard HEAD
+          git clean -fdx
+
+      - name: Debug dependency files
+        run: |
+          echo "commit: $(git rev-parse HEAD)"
+          echo "branch ref: ${GITHUB_REF:-unknown}"
+          echo "package.json checksum:" && sha256sum package.json
+          echo "package-lock.json checksum:" && sha256sum package-lock.json
+          echo "eslint entries in package.json:" && rg '"eslint"' package.json || true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
         with:
           node-version: 22
           cache: npm
@@ -72,7 +98,11 @@ jobs:
           rm -f gitleaks.tar.gz
 
       - name: Install dependencies
-        run: npm ci
+        run: |
+          if ! npm ci; then
+            echo "WARNING: npm ci fehlgeschlagen (Lockfile-Drift?). Fallback auf npm install."
+            npm install
+          fi
 
       - name: Lint
         run: npm run lint
@@ -91,16 +121,16 @@ jobs:
 
       - name: OSV-Scanner (SCA)
         run: |
+          cd "$GITHUB_WORKSPACE"
           curl -L -o osv-scanner https://github.com/google/osv-scanner/releases/latest/download/osv-scanner_linux_amd64
           chmod +x osv-scanner
           ./osv-scanner --version
-          test -f ./package-lock.json
-          ./osv-scanner --lockfile ./package-lock.json
+          test -f "$GITHUB_WORKSPACE/package-lock.json"
+          ./osv-scanner scan -L "$GITHUB_WORKSPACE/package-lock.json" --config "$GITHUB_WORKSPACE/.osv-scanner.toml"
 
   deploy-production:
-    needs: analyze
     runs-on: ubuntu-latest
-    if: success() && github.event_name == 'push' && github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
       - name: Prepare SSH
         run: |
@@ -126,7 +156,7 @@ jobs:
             -o BatchMode=yes \
             -p "${{ vars.PROD_PORT }}" \
             "${{ vars.PROD_USER }}@${{ vars.PROD_HOST }}" \
-            "bash -lc 'cd /var/www/harheimertc && git fetch origin main && git checkout -B main origin/main && git reset --hard origin/main && ./deploy-production.sh'"
+            "bash -lc 'cd /var/www/harheimertc && git reset --hard HEAD && git fetch origin main && git checkout -B main origin/main && git reset --hard origin/main && ./deploy-production.sh'"
 
   deploy-test:
     needs: analyze
@@ -157,4 +187,4 @@ jobs:
             -o BatchMode=yes \
             -p "${{ vars.PROD_PORT }}" \
             "${{ vars.PROD_USER }}@${{ vars.PROD_HOST }}" \
-            "bash -lc 'cd /var/www/harheimertc.test && git fetch origin dev && git checkout -B dev origin/dev && git reset --hard origin/dev && ./deploy-test.sh'"
+            "bash -lc 'cd /var/www/harheimertc.test && git reset --hard HEAD && git fetch origin dev && git checkout -B dev origin/dev && git reset --hard origin/dev && ./deploy-test.sh'"

.github/workflows/android-ci.yml

@@ -10,14 +10,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache Gradle
-        uses: actions/cache@v4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
           path: |
             ~/.gradle/caches

.gitignore

@@ -93,6 +93,9 @@ dist
 /android-app/.kotlin/
 /android-app/**/build/
 /android-app/local.properties
+/android-app/gradle-local.properties
+# JVM Heap-Dumps sind lokale Diagnoseartefakte und dürfen nie ins Repository.
+*.hprof
 
 # Build output (but keep production data!)
 .output

.gitleaks.toml

@@ -0,0 +1,7 @@
+[[allowlists]]
+description = "generated/imported non-secret data"
+paths = [
+  '''server/data/spielplan-import/harheimer_tc_spielplan\.(html|json)$''',
+  '''android-app/app/build/.*''',
+  '''android-app/\.idea/planningMode\.xml$''',
+]

.gitleaksignore

@@ -0,0 +1,3 @@
+google-services.json:gcp-api-key:18
+google-services.json:gcp-api-key:37
+google-services.json:gcp-api-key:56

.osv-scanner.toml

@@ -0,0 +1,4 @@
+[[IgnoredVulns]]
+id = "GHSA-v3m3-f69x-jf25"
+ignoreUntil = 2026-12-31
+reason = "Temporary exception: Quill 2.0.3 is required by the current RichTextEditor implementation, and OSV currently reports no fixed version. Track upstream fix and remove this ignore once a patched release is available."

android-app/PLAYSTORE_ASSETS.md

@@ -36,13 +36,12 @@ Ausgabe in:
 
 ## 3) Screenshots (anonymisiert)
 
-### Grobe Anforderungen (Telefon)
-- Mindestens 2 Screenshots
-- PNG oder JPEG
-- Seitenlaenge je Seite zwischen 320 px und 3840 px
+### Zielgroessen fuer Store-Upload
+- Telefon (Portrait): 1080 x 1920
+- Medium 7" Tablet (Portrait): 1200 x 1920
+- 10" Tablet (Portrait): 1600 x 2560
 
-Empfehlung fuer Android-Phone:
-- 1080 x 1920 (Portrait)
+Alle Dateien als PNG oder JPEG.
 
 ### Anonymisierung
 
@@ -61,10 +60,33 @@ Beispiel:
   '68,118,520,72;70,706,560,98'
 ```
 
+### Zielprofile erzeugen (Telefon, 7", 10")
+
+Aus allen Dateien in `android-app/playstore-assets/anon` werden die drei Profile erzeugt:
+
+```bash
+./scripts/playstore-screenshot-sizes.sh
+```
+
+Optional mit eigenen Ordnern:
+
+```bash
+./scripts/playstore-screenshot-sizes.sh \
+  --input-dir android-app/playstore-assets/anon \
+  --output-dir android-app/playstore-assets/final
+```
+
+Output:
+- android-app/playstore-assets/final/phone
+- android-app/playstore-assets/final/tablet-7
+- android-app/playstore-assets/final/tablet-10
+
 ## 4) Upload in Play Console
 
 - Datenschutzerklaerung: URL eintragen
 - Konto-Loeschung: URL eintragen
 - App-Icon: playstore-icon-512.png
 - Feature Graphic: playstore-feature-graphic-1024x500.png
-- Screenshots: anonymisierte PNG/JPEG hochladen
+- Screenshots Telefon: Dateien aus `.../final/phone`
+- Screenshots 7" Tablet: Dateien aus `.../final/tablet-7`
+- Screenshots 10" Tablet: Dateien aus `.../final/tablet-10`

android-app/app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("com.google.devtools.ksp")
@@ -5,12 +7,17 @@ plugins {
     id("com.google.dagger.hilt.android")
 }
 
+if (file("google-services.json").exists()) {
+    apply(plugin = "com.google.gms.google-services")
+}
+
 val localApiBaseUrl = providers.gradleProperty("LOCAL_API_BASE_URL")
     .orElse("https://harheimertc.tsschulz.de/")
     .get()
 val productionApiBaseUrl = providers.gradleProperty("PRODUCTION_API_BASE_URL")
     .orElse("https://harheimertc.de/")
     .get()
+val expectedProductionApiBaseUrl = "https://harheimertc.de/"
 val sentryDsn = providers.gradleProperty("SENTRY_DSN")
     .orElse("")
     .get()
@@ -25,27 +32,69 @@ val releaseMinifyEnabled = providers.gradleProperty("RELEASE_MINIFY_ENABLED")
     .orElse("true")
     .get()
     .toBoolean()
-val releaseStoreFile = providers.gradleProperty("RELEASE_STORE_FILE").orNull
-val releaseStorePassword = providers.gradleProperty("RELEASE_STORE_PASSWORD").orNull
-val releaseKeyAlias = providers.gradleProperty("RELEASE_KEY_ALIAS").orNull
-val releaseKeyPassword = providers.gradleProperty("RELEASE_KEY_PASSWORD").orNull
+
+val localSigningProperties = Properties().apply {
+    val localSigningFile = rootProject.file("gradle-local.properties")
+    if (localSigningFile.exists()) {
+        localSigningFile.inputStream().use { load(it) }
+    }
+}
+
+fun signingProperty(name: String): String? =
+    providers.gradleProperty(name).orNull
+        ?: providers.environmentVariable(name).orNull
+        ?: localSigningProperties.getProperty(name)
+
+val releaseStoreFile = signingProperty("RELEASE_STORE_FILE")
+val releaseStorePassword = signingProperty("RELEASE_STORE_PASSWORD")
+val releaseKeyAlias = signingProperty("RELEASE_KEY_ALIAS")
+val releaseKeyPassword = signingProperty("RELEASE_KEY_PASSWORD")
 val hasReleaseSigning = !releaseStoreFile.isNullOrBlank() &&
     !releaseStorePassword.isNullOrBlank() &&
     !releaseKeyAlias.isNullOrBlank() &&
     !releaseKeyPassword.isNullOrBlank()
 
+val ensureReleaseSigning = tasks.register("ensureReleaseSigning") {
+    doFirst {
+        if (!hasReleaseSigning) {
+            throw GradleException(
+                "Production release signing is not configured. " +
+                    "Set RELEASE_STORE_FILE, RELEASE_STORE_PASSWORD, RELEASE_KEY_ALIAS and RELEASE_KEY_PASSWORD " +
+                    "(e.g. via ~/.gradle/gradle.properties, environment variables, or android-app/gradle-local.properties)."
+            )
+        }
+    }
+}
+
+val ensureProductionApiBaseUrl = tasks.register("ensureProductionApiBaseUrl") {
+    doFirst {
+        if (productionApiBaseUrl != expectedProductionApiBaseUrl) {