Use the new Server.addPublication() API (#387)

Author: mickael-menu

r2-testapp/src/main/java/org/readium/r2/testapp/library/LibraryActivity.kt

@@ -584,37 +584,34 @@ class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClickListe
                     progress.dismiss()
                     presentOpeningException(it)
                 }
-                .onSuccess { it ->
-                    if (it.isRestricted) {
-                        progress.dismiss()
-                        it.protectionError?.let { error ->
+                .onSuccess { publication ->
+                    progress.dismiss()
+
+                    if (publication.isRestricted) {
+                        publication.protectionError?.let { error ->
                             Timber.d(error)
                             catalogView.longSnackbar(error.getUserMessage(this@LibraryActivity))
                         }
                     } else {
-                        prepareToServe(it, asset)
-                        progress.dismiss()
                         navigatorLauncher.launch(
                             NavigatorContract.Input(
                                 file = asset.file,
                                 mediaType = mediaType,
-                                publication = it,
+                                publication = publication,
                                 bookId = book.id,
                                 initialLocator = book.id?.let { id -> booksDB.books.currentLocator(id) },
                                 deleteOnResult = remoteAsset != null,
-                                baseUrl = Publication.localBaseUrlOf(asset.name, localPort)
+                                baseUrl = prepareToServe(publication, asset)
                             )
                     	)
                     }
                 }
         }
     }
 
-    private fun prepareToServe(publication: Publication, asset: PublicationAsset) {
-        val key = publication.metadata.identifier ?: publication.metadata.title
-        preferences.edit().putString("$key-publicationPort", localPort.toString()).apply()
+    private fun prepareToServe(publication: Publication, asset: PublicationAsset): URL? {
         val userProperties = applicationContext.filesDir.path + "/" + Injectable.Style.rawValue + "/UserProperties.json"
-        server.addEpub(publication, null, "/${asset.name}", userProperties)
+        return server.addPublication(publication, userPropertiesFile = File(userProperties))
     }
 
     private fun presentOpeningException(error: Publication.OpeningException) {

r2-testapp/src/main/java/org/readium/r2/testapp/utils/NavigatorContract.kt

@@ -26,6 +26,7 @@ import org.readium.r2.testapp.comic.DiViNaActivity
 import org.readium.r2.testapp.epub.EpubActivity
 import org.readium.r2.testapp.pdf.PdfActivity
 import java.io.File
+import java.net.URL
 
 class NavigatorContract : ActivityResultContract<NavigatorContract.Input, NavigatorContract.Output>() {
 
@@ -36,7 +37,7 @@ class NavigatorContract : ActivityResultContract<NavigatorContract.Input, Naviga
         val bookId: Long?,
         val initialLocator: Locator? = null,
         val deleteOnResult: Boolean = false,
-        val baseUrl: String? = null
+        val baseUrl: URL? = null
     )
 
     data class Output(
@@ -61,7 +62,7 @@ class NavigatorContract : ActivityResultContract<NavigatorContract.Input, Naviga
             putExtra("publicationPath", input.file.path)
             putExtra("publicationFileName", input.file.name)
             putExtra("deleteOnResult", input.deleteOnResult)
-            putExtra("baseUrl", input.baseUrl)
+            putExtra("baseUrl", input.baseUrl?.toString())
             putExtra("locator", input.initialLocator)
         }
     }