Minor fixes (readium#449)

marshal1919 · Jan 19, 2024 · b13bc52 · b13bc52
1 parent b0967f7
commit b13bc52
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/readium/navigator/src/main/java/org/readium/r2/navigator/VisualNavigator.kt b/readium/navigator/src/main/java/org/readium/r2/navigator/VisualNavigator.kt
@@ -24,7 +24,7 @@ import org.readium.r2.shared.publication.ReadingProgression as PublicationReadin
 public interface VisualNavigator : Navigator {
 
     @Deprecated(
-        "Moved to DirectionalNavigator",
+        "Renamed to OverflowableNavigator.Overflow",
         level = DeprecationLevel.ERROR
     )
     @OptIn(ExperimentalReadiumApi::class)
@@ -126,7 +126,7 @@ public interface VisualNavigator : Navigator {
      * Moves to the next content portion (eg. page) in the reading progression direction.
      */
     @Deprecated(
-        "Moved to DirectionalNavigator",
+        "Moved to OverflowableNavigator",
         level = DeprecationLevel.ERROR
     )
     public fun goForward(animated: Boolean = false, completion: () -> Unit = {}): Boolean
@@ -135,7 +135,7 @@ public interface VisualNavigator : Navigator {
      * Moves to the previous content portion (eg. page) in the reading progression direction.
      */
     @Deprecated(
-        "Moved to DirectionalNavigator",
+        "Moved to OverflowableNavigator",
         level = DeprecationLevel.ERROR
     )
     public fun goBackward(animated: Boolean = false, completion: () -> Unit = {}): Boolean

diff --git a/readium/navigator/src/main/java/org/readium/r2/navigator/media/MediaSessionNavigator.kt b/readium/navigator/src/main/java/org/readium/r2/navigator/media/MediaSessionNavigator.kt
@@ -208,15 +208,15 @@ public class MediaSessionNavigator(
         return go(locator, animated, completion)
     }
 
-    public fun goForward(animated: Boolean, completion: () -> Unit): Boolean {
+    public fun goForward(animated: Boolean = true, completion: () -> Unit = {}): Boolean {
         if (!isActive) return false
 
         seekRelative(skipForwardInterval)
         completion()
         return true
     }
 
-    public fun goBackward(animated: Boolean, completion: () -> Unit): Boolean {
+    public fun goBackward(animated: Boolean = true, completion: () -> Unit = {}): Boolean {
         if (!isActive) return false
 
         seekRelative(-skipBackwardInterval)

diff --git a/...rc/main/java/org/readium/r2/shared/util/downloads/foreground/ForegroundDownloadManager.kt b/...rc/main/java/org/readium/r2/shared/util/downloads/foreground/ForegroundDownloadManager.kt
@@ -57,8 +57,17 @@ public class ForegroundDownloadManager(
     }
 
     private suspend fun doRequest(request: DownloadManager.Request, id: DownloadManager.RequestId) {
-        val destination = withContext(Dispatchers.IO) {
-            File.createTempFile(UUID.randomUUID().toString(), null, downloadsDirectory)
+        val destination: File
+        try {
+            destination = withContext(Dispatchers.IO) {
+                File.createTempFile(UUID.randomUUID().toString(), null, downloadsDirectory)
+            }
+        } catch (exception: IOException) {
+            val error = DownloadManager.DownloadError.FileSystem(FileSystemError.IO(exception))
+            forEachListener(id) {
+                onDownloadFailed(id, error)
+            }
+            return
         }
 
         httpClient