From cce86a970cf9b0e659f7171ec24d6b4446ebc8eb Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Thu, 14 Jan 2021 14:14:00 +0100
Subject: [PATCH] Fix #278

---
 .../anotherwidget/receivers/UpdatesReceiver.kt             | 2 --
 .../anotherwidget/services/LocationService.kt              | 7 ++-----
 .../anotherwidget/services/UpdateCalendarService.kt        | 7 ++-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
index 76066d8..73c458d 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
@@ -57,8 +57,6 @@ class UpdatesReceiver : BroadcastReceiver() {
             }
 
             Actions.ACTION_REFRESH -> {
-                ActiveNotificationsHelper.clearLastNotification(context)
-
                 GlobalScope.launch(Dispatchers.IO) {
                     CalendarHelper.updateEventList(context)
                     MediaPlayerHelper.updatePlayingMediaInfo(context)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt
index b3cd8a5..906b438 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt
@@ -34,6 +34,7 @@ class LocationService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForeground(LOCATION_ACCESS_NOTIFICATION_ID, getLocationAccessNotification())
         job?.cancel()
         job = GlobalScope.launch(Dispatchers.IO) {
             if (ActivityCompat.checkSelfPermission(
@@ -85,11 +86,7 @@ class LocationService : Service() {
 
         @JvmStatic
         fun requestNewLocation(context: Context) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                context.startForegroundService(Intent(context, LocationService::class.java))
-            } else {
-                context.startService(Intent(context, LocationService::class.java))
-            }
+            ContextCompat.startForegroundService(context, Intent(context, LocationService::class.java))
         }
     }
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt
index e5cc820..2ca944b 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt
@@ -35,11 +35,7 @@ class UpdateCalendarService : Service() {
     companion object {
         const val CALENDAR_SYNC_NOTIFICATION_ID = 28468
         fun enqueueWork(context: Context) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                context.startForegroundService(Intent(context, UpdateCalendarService::class.java))
-            } else {
-                context.startService(Intent(context, UpdateCalendarService::class.java))
-            }
+            ContextCompat.startForegroundService(context, Intent(context, UpdateCalendarService::class.java))
         }
     }
 
@@ -55,6 +51,7 @@ class UpdateCalendarService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        startForeground(CALENDAR_SYNC_NOTIFICATION_ID, getCalendarSyncNotification())
         job?.cancel()
         job = GlobalScope.launch(Dispatchers.IO) {