From 86cebda9cd971de08474c619aa1fbd1358c06eb4 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 29 Aug 2024 21:12:13 +0200
Subject: [PATCH] Revert "switch foreground service type"

This reverts commit a518a3dec8c086c46cab86b11b46a2c34ba816a6.
---
 app/src/main/AndroidManifest.xml                 | 5 ++---
 app/src/main/kotlin/d/d/meshenger/MainService.kt | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27e3d90a7..2d59a9b03 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,8 +6,7 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <!-- Backup Import/Export -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -57,7 +56,7 @@
         <service
             android:name=".MainService"
             android:exported="false"
-            android:foregroundServiceType="camera|microphone" />
+            android:foregroundServiceType="mediaPlayback" />
 
         <activity
             android:name=".StartActivity"
diff --git a/app/src/main/kotlin/d/d/meshenger/MainService.kt b/app/src/main/kotlin/d/d/meshenger/MainService.kt
index 8701351a7..432909532 100644
--- a/app/src/main/kotlin/d/d/meshenger/MainService.kt
+++ b/app/src/main/kotlin/d/d/meshenger/MainService.kt
@@ -3,8 +3,7 @@ package d.d.meshenger
 import android.app.*
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
 import android.graphics.Color
 import android.os.Binder
 import android.os.Build
@@ -187,7 +186,7 @@ class MainService : Service(), Runnable {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
                 startForeground(NOTIFICATION_ID, notification)
             } else {
-                startForeground(NOTIFICATION_ID, notification, FOREGROUND_SERVICE_TYPE_MICROPHONE or FOREGROUND_SERVICE_TYPE_CAMERA)
+                startForeground(NOTIFICATION_ID, notification, FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
             }
         } else if (intent.action == STOP_FOREGROUND_ACTION) {
             Log.d(this, "onStartCommand() Received Stop Foreground Intent")