Closes issue #8363: Call startForegroundService instead of startServi…

…ce on DownloadMiddleware
mozilla-mobile · Sep 10, 2020 · 464408c · 464408c
1 parent 4096688
commit 464408c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...eature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadMiddleware.kt b/...eature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadMiddleware.kt
@@ -8,6 +8,7 @@ import android.app.DownloadManager
 import android.content.Context
 import android.content.Intent
 import androidx.annotation.VisibleForTesting
+import androidx.core.content.ContextCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.InternalCoroutinesApi
@@ -113,8 +114,13 @@ class DownloadMiddleware(
         if (download.status !in arrayOf(COMPLETED, CANCELLED)) {
             val intent = Intent(applicationContext, downloadServiceClass)
             intent.putExtra(DownloadManager.EXTRA_DOWNLOAD_ID, download.id)
-            applicationContext.startService(intent)
+            startForegroundService(intent)
             logger.debug("Sending download intent ${download.fileName}")
         }
     }
+
+    @VisibleForTesting
+    internal fun startForegroundService(intent: Intent) {
+        ContextCompat.startForegroundService(applicationContext, intent)
+    }
 }
diff --git a/...re/downloads/src/test/java/mozilla/components/feature/downloads/DownloadMiddlewareTest.kt b/...re/downloads/src/test/java/mozilla/components/feature/downloads/DownloadMiddlewareTest.kt
@@ -37,6 +37,7 @@ import org.junit.runner.RunWith
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.times
 import org.mockito.Mockito.never
+import org.mockito.Mockito.spy
 
 @RunWith(AndroidJUnit4::class)
 class DownloadMiddlewareTest {
@@ -63,12 +64,12 @@ class DownloadMiddlewareTest {
     @Test
     fun `service is started when download is queued`() = runBlockingTest {
         val applicationContext: Context = mock()
-        val downloadMiddleware = DownloadMiddleware(
+        val downloadMiddleware = spy(DownloadMiddleware(
             applicationContext,
             AbstractFetchDownloadService::class.java,
             coroutineContext = dispatcher,
             downloadStorage = mock()
-        )
+        ))
         val store = BrowserStore(
             initialState = BrowserState(),
             middleware = listOf(downloadMiddleware)
@@ -78,7 +79,7 @@ class DownloadMiddlewareTest {
         store.dispatch(DownloadAction.AddDownloadAction(download)).joinBlocking()
 
         val intentCaptor = argumentCaptor<Intent>()
-        verify(applicationContext).startService(intentCaptor.capture())
+        verify(downloadMiddleware).startForegroundService(intentCaptor.capture())
         assertEquals(download.id, intentCaptor.value.getStringExtra(EXTRA_DOWNLOAD_ID))
     }