From bf43cdc887d1d3f5c4fca814955ee370e1eb97e9 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 13 Feb 2024 17:12:40 +0100
Subject: [PATCH] Revert "Bugfix: PublicAPI stop should not start
 TrackRecordingService in foreground."

This reverts commit da3dd29b8e44624a8222caea9067955f252ef5f8.
---
 .../opentracks/publicapi/PublicApiTest.java   | 56 -------------------
 .../TrackRecordingServiceConnection.java      |  6 +-
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 src/androidTest/java/de/dennisguse/opentracks/publicapi/PublicApiTest.java

diff --git a/src/androidTest/java/de/dennisguse/opentracks/publicapi/PublicApiTest.java b/src/androidTest/java/de/dennisguse/opentracks/publicapi/PublicApiTest.java
deleted file mode 100644
index 92960d1a4..000000000
--- a/src/androidTest/java/de/dennisguse/opentracks/publicapi/PublicApiTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package de.dennisguse.opentracks.publicapi;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.GrantPermissionRule;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TestUtil;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.IntentUtils;
-
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class PublicApiTest {
-
-    @Rule
-    public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule();
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    @Test
-    public void StartTest() {
-        PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
-
-        context.startActivity(IntentUtils.newIntent(context, StartRecording.class));
-    }
-
-    @Test
-    public void StartStopTest() throws InterruptedException {
-        PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
-
-        context.startActivity(IntentUtils.newIntent(context, StartRecording.class));
-
-        Thread.sleep(5000);
-
-        context.startActivity(IntentUtils.newIntent(context, StopRecording.class));
-    }
-
-    @Test
-    public void StopAndWait() throws InterruptedException {
-        PreferencesUtils.setBoolean(R.string.publicapi_enabled_key, true);
-
-        context.startActivity(IntentUtils.newIntent(context, StopRecording.class));
-
-        Thread.sleep(10000);
-
-        //No ForegroundServiceDidNotStartInTimeException should be happening.
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
index ebf55b109..8738ac7cd 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
@@ -26,6 +26,7 @@ import android.os.RemoteException;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.BuildConfig;
 
@@ -80,8 +81,7 @@ public class TrackRecordingServiceConnection {
         }
 
         Log.i(TAG, "Binding the service.");
-
-        int flags = Context.BIND_AUTO_CREATE + (BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0);
+        int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0;
         context.bindService(new Intent(context, TrackRecordingService.class), serviceConnection, flags);
     }
 
@@ -142,6 +142,6 @@ public class TrackRecordingServiceConnection {
         new TrackRecordingServiceConnection(withUnbind)
                 .bind(context);
 
-        // ContextCompat.startForegroundService(context, new Intent(context, TrackRecordingService.class));
+        ContextCompat.startForegroundService(context, new Intent(context, TrackRecordingService.class));
     }
 }