Skip to content

Use startForegroundService() for the MediaService #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 11, 2022
Merged

Use startForegroundService() for the MediaService #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0423731
Use `startForegroundService()` for the `MediaService`
mickael-menu Mar 23, 2022
5ac3e81
Deprecate Fuel's `Request.promise()` extension
mickael-menu Mar 29, 2022
c38de34
Merge branch 'develop' into fix/media-service
mickael-menu Mar 29, 2022
ac7af38
Fix deprecation comment
mickael-menu Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion readium/navigator/src/main/java/org/readium/r2/navigator/media/MediaService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.os.Build
import android.os.Bundle
import android.os.Process
import android.os.ResultReceiver
Expand Down Expand Up @@ -303,7 +304,7 @@ open class MediaService : MediaBrowserServiceCompat(), CoroutineScope by MainSco
val currentNavigator: StateFlow<MediaSessionNavigator?> get() = navigator

fun getNavigator(context: Context, publication: Publication, publicationId: PublicationId, initialLocator: Locator?): MediaSessionNavigator {
context.startService(Intent(context, serviceClass))
context.startForegroundServiceCompat(Intent(context, serviceClass))

currentNavigator.value
?.takeIf { it.publicationId == publicationId }
Expand All @@ -329,6 +330,14 @@ open class MediaService : MediaBrowserServiceCompat(), CoroutineScope by MainSco

}

private fun Context.startForegroundServiceCompat(intent: Intent) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForegroundService(intent)
} else {
startService(intent)
}
}

// FIXME: Move to r2-shared
internal fun <T> createIfNull(property: KMutableProperty0<T?>, owner: Any, factory: () -> T): T =
property.get() ?: synchronized(owner) {
Expand Down
1 change: 1 addition & 0 deletions readium/shared/src/main/java/org/readium/r2/shared/FuelPromiseExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.deferred
import nl.komponents.kovenant.task

@Deprecated("Dependency to Fuel and kovenant will eventually be removed from the Readium Toolkit")
fun Request.promise(): Promise<Triple<Request, Response, ByteArray>, Exception> {
val deferred = deferred<Triple<Request, Response, ByteArray>, Exception>()
task { response() } success {
Expand Down