From 30dc83a847d8e064804561b8667176d8c30651c6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 6 Mar 2023 16:48:40 -0300
Subject: [PATCH] Fix warnings
---
.../java/org/briarproject/mailbox/android/MailboxService.kt | 4 +++-
.../java/org/briarproject/mailbox/android/StatusManager.kt | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
index 300e235d..e3d267ee 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
@@ -26,6 +26,8 @@ import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.content.IntentFilter
import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import androidx.core.app.ServiceCompat.stopForeground
import androidx.core.content.ContextCompat
import dagger.hilt.android.AndroidEntryPoint
import org.briarproject.mailbox.R
@@ -156,7 +158,7 @@ class MailboxService : Service() {
override fun onDestroy() {
super.onDestroy()
LOG.info("Destroyed")
- stopForeground(true)
+ stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
if (receiver != null) unregisterReceiver(receiver)
if (started) {
androidExecutor.runOnBackgroundThread {
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
index 45532124..78ed570c 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
@@ -25,6 +25,7 @@ import android.graphics.Bitmap
import androidx.annotation.StringRes
import androidx.annotation.UiThread
import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.GlobalScope
@@ -60,6 +61,7 @@ import javax.inject.Singleton
import kotlin.math.min
@Singleton
+@OptIn(DelicateCoroutinesApi::class)
class StatusManager @Inject constructor(
@ApplicationContext private val context: Context,
lifecycleManager: LifecycleManager,
--
GitLab