From 3e34fc8b8ec2f14f448e477af8b246c2a2a94d41 Mon Sep 17 00:00:00 2001 From: alexb151 Date: Thu, 29 Feb 2024 20:29:20 +0000 Subject: [PATCH 1/4] Update TtsService.java Handle foreground service for versions greater than sdk33 --- .../main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java index e7a7f2d78..7a25fcf71 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java @@ -1138,7 +1138,11 @@ private void setForegroundAndNotification(boolean forceForeground) { if (foreground) { if (!isForeground) { Log.v(TAG, "setForegroundAndNotification() startForeground()"); - startForeground(NOTIFICATION_ID, generateNotification()); + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) { + startForeground(NOTIFICATION_ID, generateNotification()) + } else { + startForeground(NOTIFICATION_ID, generateNotification(), FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK) + } isForeground = true; } } else { From 2af186486af316fa634fefde9c429ca6e5f019fd Mon Sep 17 00:00:00 2001 From: alexb151 Date: Thu, 29 Feb 2024 21:35:48 +0000 Subject: [PATCH 2/4] Update TtsService.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added missing Semi colons 😭 --- app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java index 7a25fcf71..e03102f9f 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java @@ -1139,9 +1139,9 @@ private void setForegroundAndNotification(boolean forceForeground) { if (!isForeground) { Log.v(TAG, "setForegroundAndNotification() startForeground()"); if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) { - startForeground(NOTIFICATION_ID, generateNotification()) + startForeground(NOTIFICATION_ID, generateNotification()); } else { - startForeground(NOTIFICATION_ID, generateNotification(), FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK) + startForeground(NOTIFICATION_ID, generateNotification(), FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK); } isForeground = true; } From 5631d99f4024c341b44cd1ec202e9129f567a670 Mon Sep 17 00:00:00 2001 From: alexb151 Date: Thu, 29 Feb 2024 21:41:28 +0000 Subject: [PATCH 3/4] Update TtsService.java Import build package --- app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java index e03102f9f..f2e4ea7a8 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java @@ -14,6 +14,7 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.SystemClock; From f3a4b73599ea08a82b1418b0dfed074e683b607d Mon Sep 17 00:00:00 2001 From: alexb151 Date: Thu, 29 Feb 2024 21:48:26 +0000 Subject: [PATCH 4/4] Update TtsService.java Import service info package --- app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java index f2e4ea7a8..3b0d95247 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java @@ -10,6 +10,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.pm.ServiceInfo; import android.graphics.Bitmap; import android.media.AudioManager; import android.media.MediaPlayer; @@ -1142,7 +1143,7 @@ private void setForegroundAndNotification(boolean forceForeground) { if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) { startForeground(NOTIFICATION_ID, generateNotification()); } else { - startForeground(NOTIFICATION_ID, generateNotification(), FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK); + startForeground(NOTIFICATION_ID, generateNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK); } isForeground = true; }