From 8a20edb83a8890f3155ce9ef9fa868dc0bda48aa Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 23 Sep 2023 19:06:56 +0200
Subject: [PATCH 1/2] Revert "Github Actions: disable test execution as results
 are flaky due to performance limitations."

This reverts commit 8f9cbcc077fe853a5a360193166f83bd59113b15.
---
 .github/workflows/{test.yml.disabled => test.yml} | 3 ---
 1 file changed, 3 deletions(-)
 rename .github/workflows/{test.yml.disabled => test.yml} (84%)

diff --git a/.github/workflows/test.yml.disabled b/.github/workflows/test.yml
similarity index 84%
rename from .github/workflows/test.yml.disabled
rename to .github/workflows/test.yml
index a0976b7ce..e78641000 100644
--- a/.github/workflows/test.yml.disabled
+++ b/.github/workflows/test.yml
@@ -1,6 +1,3 @@
-# We have flaky test results due to performance limitations in Github Actions.
-# Happens too often nowadays; See https://github.com/OpenTracksApp/OpenTracks/issues/1409
-
 #https://github.com/marketplace/actions/android-emulator-runner
 name: Test
 on:

From b3601910558e7361d1557aa49c2903cef2499821 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 23 Sep 2023 19:09:11 +0200
Subject: [PATCH 2/2] Github action: test runner uses updated dependencies and
 only executes agains API34.

---
 .github/workflows/test.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e78641000..e4eaa33d9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,27 +8,20 @@ jobs:
   test:
     timeout-minutes: 45
     runs-on: macos-latest
-    strategy:
-      matrix:
-        api-level: [ 24, 30 ]
-        target: [ default ]
-      fail-fast: false
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: '11'
+          distribution: 'adopt'
+          java-version: '17'
 
       - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.26.0
+        uses: reactivecircus/android-emulator-runner@v2.28.0
         with:
-          api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
           arch: x86_64
-          profile: Nexus 6
+          api-level: 34
           script: ./gradlew connectedCheck
 
       - name: Archive