react-native-readium 3.0.3 → 4.0.1

package/README.md

@@ -85,6 +85,7 @@ target 'ExampleApp' do
   config = use_native_modules!
   ...
   pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.5/GCDWebServer.podspec', modular_headers: true
+  pod 'ReadiumAdapterGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec', modular_headers: true
   pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumNavigator.podspec'
   pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumShared.podspec'
   pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumStreamer.podspec'
@@ -160,7 +161,7 @@ DRM is not supported at this time. However, there is a clear path to [support it
 |------|------|----------|-------------|
 | `file`     | [`File`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/File.ts)               | :x:                | A file object containing the path to the eBook file on disk. |
 | `location` | [`Locator`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Locator.ts) \| [`Link`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Link.ts)           | :white_check_mark: | A locator prop that allows you to externally control the location of the reader (e.g. Chapters or Bookmarks). <br/><br/>:warning: If you want to set the `location` of an ebook on initial load, you should use the `File.initialLocation` property (look at the `file` prop). See more [here](https://github.com/5-stones/react-native-readium/issues/16#issuecomment-1344128937) |
-| `settings` | [`Partial<Settings>`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Settings.ts)  | :white_check_mark: | An object that allows you to control various aspects of the reader's UI (epub only) |
+| `preferences` | [`Partial<Preferences>`](https://github.com/readium/swift-toolkit/blob/main/docs/Guides/Navigator%20Preferences.md#appendix-preference-constraints)  | :white_check_mark: | An object that allows you to control various aspects of the reader's UI (epub only) |
 | `style`    | `ViewStyle`          | :white_check_mark: | A traditional style object. |
 | `onLocationChange` | `(locator: Locator) => void` | :white_check_mark: | A callback that fires whenever the location is changed (e.g. the user transitions to a new page)|
 | `onTableOfContents` | `(toc: Link[] \| null) => void` | :white_check_mark: | A callback that fires once the file is parsed and emits the table of contents embedded in the file. Returns `null` or an empty `[]` if no TOC exists. See the [`Link`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Link.ts) interface for more info. |

package/android/src/main/java/com/reactnativereadium/ReadiumView.kt

@@ -9,9 +9,12 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.reactnativereadium.reader.BaseReaderFragment
 import com.reactnativereadium.reader.EpubReaderFragment
 import com.reactnativereadium.reader.ReaderViewModel
+import com.reactnativereadium.reader.VisualReaderFragment
 import com.reactnativereadium.utils.Dimensions
 import com.reactnativereadium.utils.File
 import com.reactnativereadium.utils.LinkOrLocator
+import org.readium.r2.navigator.epub.EpubNavigatorFragment
+import org.readium.r2.navigator.epub.EpubPreferences
 import org.readium.r2.shared.extensions.toMap
 
 class ReadiumView(
@@ -21,7 +24,7 @@ class ReadiumView(
   var file: File? = null
   var fragment: BaseReaderFragment? = null
   var isViewInitialized: Boolean = false
-  var lateInitSettings: Map<String, Any>? = null
+  var lateInitSerializedUserPreferences: String? = null
 
   fun updateLocation(location: LinkOrLocator) : Boolean {
     if (fragment == null) {
@@ -31,25 +34,21 @@ class ReadiumView(
     }
   }
 
-  fun updateSettingsFromMap(map: Map<String, Any>?) {
-    if (map == null) {
-      return
-    } else if (fragment == null) {
-      lateInitSettings = map
+  fun updatePreferencesFromJsonString(preferences: String?) {
+    lateInitSerializedUserPreferences = preferences
+    if (preferences == null || fragment == null) {
       return
     }
 
     if (fragment is EpubReaderFragment) {
-      (fragment as EpubReaderFragment).updateSettingsFromMap(map)
+      (fragment as EpubReaderFragment).updatePreferencesFromJsonString(preferences)
     }
-
-    lateInitSettings = null
   }
 
   fun addFragment(frag: BaseReaderFragment) {
     fragment = frag
     setupLayout()
-    updateSettingsFromMap(lateInitSettings)
+    lateInitSerializedUserPreferences?.let { updatePreferencesFromJsonString(it)}
     val activity: FragmentActivity? = reactContext.currentActivity as FragmentActivity?
     activity!!.supportFragmentManager
       .beginTransaction()

package/android/src/main/java/com/reactnativereadium/ReadiumViewManager.kt

@@ -84,11 +84,14 @@ class ReadiumViewManager(
   fun locationToLinkOrLocator(location: ReadableMap): LinkOrLocator? {
     val json = JSONObject(location.toHashMap() as HashMap<*, *>)
     val hasLocations = json.has("locations")
+    val hasType = json.has("type") && !json.getString("type").isEmpty()
     val hasChildren = json.has("children")
     val hasHashHref = (json.get("href") as String).contains("#")
+    val hasTemplated = json.has("templated")
+
     var linkOrLocator: LinkOrLocator? = null
 
-    if ((hasChildren || hasHashHref) && !hasLocations) {
+    if ((!hasType || hasChildren || hasHashHref || hasTemplated) && !hasLocations) {
       val link = Link.fromJSON(json)
       if (link != null) {
         linkOrLocator = LinkOrLocator.Link(link)
@@ -112,11 +115,9 @@ class ReadiumViewManager(
     }
   }
 
-  @ReactProp(name = "settings")
-  fun setSettings(view: ReadiumView, settings: ReadableMap) {
-    val map = mutableMapOf<String, Any>()
-    settings.toHashMap().forEach { (key, value) -> if (value != null) map[key] = value }
-    view.updateSettingsFromMap(map)
+  @ReactProp(name = "preferences")
+  fun setPreferences(view: ReadiumView, serialisedPreferences: String) {
+    view.updatePreferencesFromJsonString(serialisedPreferences)
   }
 
   @ReactPropGroup(names = ["width", "height"], customType = "Style")

package/android/src/main/java/com/reactnativereadium/reader/EpubReaderFragment.kt

@@ -14,9 +14,7 @@ import android.view.accessibility.AccessibilityManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.commitNow
-import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.ViewModelProvider
-import com.reactnativereadium.epub.UserSettings
 import com.reactnativereadium.R
 import com.reactnativereadium.utils.toggleSystemUi
 import java.net.URL
@@ -24,11 +22,11 @@ import kotlinx.coroutines.delay
 import org.readium.r2.navigator.epub.EpubNavigatorFragment
 import org.readium.r2.navigator.ExperimentalDecorator
 import org.readium.r2.navigator.Navigator
-import org.readium.r2.shared.APPEARANCE_REF
+import org.readium.r2.navigator.epub.EpubPreferences
+import org.readium.r2.navigator.epub.EpubPreferencesSerializer
 import org.readium.r2.shared.publication.Locator
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.ReadiumCSSName
-import org.readium.r2.shared.SCROLL_REF
 
 @OptIn(ExperimentalDecorator::class)
 class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listener {
@@ -38,13 +36,13 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
     private lateinit var publication: Publication
     lateinit var navigatorFragment: EpubNavigatorFragment
     private lateinit var factory: ReaderViewModel.Factory
-    private var initialSettingsMap: Map<String, Any>? = null
+    private var initialPreferencesJsonString: String? = null
 
     private lateinit var menuScreenReader: MenuItem
     private lateinit var menuSearch: MenuItem
     lateinit var menuSearchView: SearchView
 
-    private lateinit var userSettings: UserSettings
+    private lateinit var userPreferences: EpubPreferences
     private var isScreenReaderVisible = false
     private var isSearchViewIconified = true
 
@@ -61,12 +59,16 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
       )
     }
 
-    fun updateSettingsFromMap(map: Map<String, Any>) {
-      if (this::userSettings.isInitialized) {
-        userSettings.updateSettingsFromMap(map)
-        initialSettingsMap = null
+    fun updatePreferencesFromJsonString(serialisedPreferences: String) {
+      if (this::userPreferences.isInitialized) {
+        val serializer = EpubPreferencesSerializer()
+        this.userPreferences = serializer.deserialize(serialisedPreferences)
+        if (navigator is EpubNavigatorFragment) {
+          (navigator as EpubNavigatorFragment).submitPreferences(this.userPreferences)
+        }
+        initialPreferencesJsonString = null
       } else {
-        initialSettingsMap = map
+        initialPreferencesJsonString = serialisedPreferences
       }
     }
 
@@ -86,12 +88,10 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
             publication = it.publication
           }
 
-        val baseUrl = checkNotNull(requireArguments().getString(BASE_URL_ARG))
 
         childFragmentManager.fragmentFactory =
             EpubNavigatorFragment.createFactory(
                 publication = publication,
-                baseUrl = baseUrl,
                 initialLocator = model.initialLocation,
                 listener = this,
                 config = EpubNavigatorFragment.Configuration().apply {
@@ -124,28 +124,16 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        val activity = requireActivity()
-        userSettings = UserSettings(
-          navigatorFragment.preferences,
-          activity,
-          publication.userSettingsUIPreset
-        )
-
-       // This is a hack to draw the right background color on top and bottom blank spaces
-        navigatorFragment.lifecycleScope.launchWhenStarted {
-            val appearancePref = navigatorFragment.preferences.getInt(APPEARANCE_REF, 0)
-            val backgroundsColors = mutableListOf("#ffffff", "#faf4e8", "#000000")
-            navigatorFragment.resourcePager.setBackgroundColor(Color.parseColor(backgroundsColors[appearancePref]))
-        }
     }
 
     override fun onResume() {
         super.onResume()
         val activity = requireActivity()
 
-        userSettings.resourcePager = navigatorFragment.resourcePager
-        initialSettingsMap?.let { updateSettingsFromMap(it) }
+        if (!this::userPreferences.isInitialized) {
+          userPreferences = EpubPreferences()
+        }
+        initialPreferencesJsonString?.let { updatePreferencesFromJsonString(it)}
 
         // If TalkBack or any touch exploration service is activated we force scroll mode (and
         // override user preferences)
@@ -153,18 +141,14 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
         isExploreByTouchEnabled = am.isTouchExplorationEnabled
 
         if (isExploreByTouchEnabled) {
-            // Preset & preferences adapted
-            publication.userSettingsUIPreset[ReadiumCSSName.ref(SCROLL_REF)] = true
-            navigatorFragment.preferences.edit().putBoolean(SCROLL_REF, true).apply() //overriding user preferences
-            userSettings.saveChanges()
-
-            lifecycleScope.launchWhenResumed {
-                delay(500)
-                userSettings.updateViewCSS(SCROLL_REF)
-            }
+          this.userPreferences = this.userPreferences.plus(
+            EpubPreferences(scroll = true)
+          )
         } else {
             if (publication.cssStyle != "cjk-vertical") {
-                publication.userSettingsUIPreset.remove(ReadiumCSSName.ref(SCROLL_REF))
+              this.userPreferences = this.userPreferences.plus(
+                EpubPreferences(scroll = null)
+              )
             }
         }
     }
@@ -181,20 +165,14 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
 
     companion object {
 
-        private const val BASE_URL_ARG = "baseUrl"
-
         private const val SEARCH_FRAGMENT_TAG = "search"
 
         private const val IS_SCREEN_READER_VISIBLE_KEY = "isScreenReaderVisible"
 
         private const val IS_SEARCH_VIEW_ICONIFIED = "isSearchViewIconified"
 
-        fun newInstance(baseUrl: URL): EpubReaderFragment {
-            return EpubReaderFragment().apply {
-                arguments = Bundle().apply {
-                    putString(BASE_URL_ARG, baseUrl.toString())
-                }
-            }
+        fun newInstance(): EpubReaderFragment {
+            return EpubReaderFragment()
         }
     }
 }

package/android/src/main/java/com/reactnativereadium/reader/ReaderService.kt

@@ -8,10 +8,8 @@ import com.reactnativereadium.utils.LinkOrLocator
 import java.io.File
 import java.io.IOException
 import java.net.ServerSocket
-import java.net.URL
 import org.readium.r2.shared.extensions.mediaType
 import org.readium.r2.shared.extensions.tryOrNull
-import org.readium.r2.shared.Injectable
 import org.readium.r2.shared.publication.Locator
 import org.readium.r2.shared.publication.asset.FileAsset
 import org.readium.r2.shared.publication.Publication
@@ -80,13 +78,11 @@ class ReaderService(
       sender = reactContext
     )
       .onSuccess {
-        val url = prepareToServe(it)
-        if (url != null) {
           val locator = locatorFromLinkOrLocator(initialLocation, it)
-          val readerFragment = EpubReaderFragment.newInstance(url)
+          val readerFragment = EpubReaderFragment.newInstance()
           readerFragment.initFactory(it, locator)
           callback.invoke(readerFragment)
-        }
+
       }
       .onFailure {
         tryOrNull { asset.file.delete() }
@@ -95,15 +91,6 @@ class ReaderService(
       }
   }
 
-  private fun prepareToServe(publication: Publication): URL? {
-    val userProperties =
-      reactContext.filesDir.path + "/" + Injectable.Style.rawValue + "/UserProperties.json"
-    return server.addPublication(
-      publication,
-      userPropertiesFile = File(userProperties)
-    )
-  }
-
   private fun startServer() {
     if (!server.isAlive) {
       try {

package/android/src/main/java/com/reactnativereadium/utils/FragmentFactory.kt

@@ -25,7 +25,7 @@ inline fun <reified T : Fragment> createFragmentFactory(crossinline factory: ()
  *
  * ```
  * supportFragmentManager.fragmentFactory = CompositeFragmentFactory(
- *     EpubNavigatorFragment.createFactory(publication, baseUrl, initialLocator, this),
+ *     EpubNavigatorFragment.createFactory(publication, initialLocator, this),
  *     PdfNavigatorFragment.createFactory(publication, initialLocator, this)
  * )
  * ```

package/ios/App/AppModule.swift

@@ -27,7 +27,7 @@ final class AppModule {
       fatalError("Can't start publication server")
     }
 
-    reader = ReaderModule(delegate: self, resourcesServer: server)
+    reader = ReaderModule(delegate: self)
 
     // Set Readium 2's logging minimum level.
     R2EnableLog(withMinimumSeverityLevel: .debug)

package/ios/Common/EPUBPreferences.swift

@@ -0,0 +1,8 @@
+//
+//  EPUBPreferences.swift
+//  react-native-readium
+//
+//  Created by Christopher Wilkinson on 11/09/2023.
+//
+
+import Foundation

package/ios/Reader/Common/ReaderViewController.swift

@@ -290,20 +290,14 @@ extension ReaderViewController: NavigatorDelegate {
 
 extension ReaderViewController: VisualNavigatorDelegate {
 
-  func navigator(_ navigator: VisualNavigator, didTapAt point: CGPoint) {
-    let viewport = navigator.view.bounds
-    // Skips to previous/next pages if the tap is on the content edges.
-    let thresholdRange = 0...(0.2 * viewport.width)
-    var moved = false
-    if thresholdRange ~= point.x {
-      moved = navigator.goLeft(animated: false)
-    } else if thresholdRange ~= (viewport.maxX - point.x) {
-      moved = navigator.goRight(animated: false)
+    func navigator(_ navigator: VisualNavigator, didTapAt point: CGPoint) {
+        let moved = DirectionalNavigationAdapter(navigator: navigator).didTap(at: point)
+        if !moved {
+            toggleNavigationBar()
+        }
     }
-
-    if !moved {
-      toggleNavigationBar()
+    
+    func navigator(_ navigator: VisualNavigator, didPressKey event: KeyEvent) {
+        DirectionalNavigationAdapter(navigator: navigator).didPressKey(event: event)
     }
-  }
-
 }

package/ios/Reader/EPUB/AssociatedColors.swift

@@ -1,19 +1,19 @@
 import UIKit
-import R2Shared
+import R2Navigator
 
 class AssociatedColors {
 
-    /// Get associated colors for a specific appearance setting
-    /// - parameter appearance: The selected appearance
+    /// Get associated colors for a specific theme setting
+    /// - parameter theme: The selected theme
     /// - Returns: A tuple with a main color and a text color
-    static func getColors(for appearance: UserProperty) -> (mainColor: UIColor, textColor: UIColor) {
+    static func getColors(for theme: Theme) -> (mainColor: UIColor, textColor: UIColor) {
         var mainColor, textColor: UIColor
 
-        switch appearance.toString() {
-        case "readium-sepia-on":
+        switch theme {
+        case .sepia:
             mainColor = UIColor.init(red: 250/255, green: 244/255, blue: 232/255, alpha: 1)
             textColor = UIColor.init(red: 18/255, green: 18/255, blue: 18/255, alpha: 1)
-        case "readium-night-on":
+        case .dark:
             mainColor = UIColor.black
             textColor = UIColor.init(red: 254/255, green: 254/255, blue: 254/255, alpha: 1)
         default:

package/ios/Reader/EPUB/EPUBModule.swift

@@ -11,25 +11,24 @@ final class EPUBModule: ReaderFormatModule {
         self.delegate = delegate
     }
 
-    var publicationFormats: [Publication.Format] {
-        return [.epub, .webpub]
+    func supports(_ publication: Publication) -> Bool {
+      publication.conforms(to: .epub)
+        || publication.readingOrder.allAreHTML
     }
 
     func makeReaderViewController(
       for publication: Publication,
       locator: Locator?,
-      bookId: String,
-      resourcesServer: ResourcesServer
+      bookId: String
     ) throws -> ReaderViewController {
         guard publication.metadata.identifier != nil else {
             throw ReaderError.epubNotValid
         }
 
-        let epubViewController = EPUBViewController(
+        let epubViewController = try EPUBViewController(
             publication: publication,
             locator: locator,
-            bookId: bookId,
-            resourcesServer: resourcesServer
+            bookId: bookId
         )
         epubViewController.moduleDelegate = delegate
         return epubViewController

package/ios/Reader/EPUB/EPUBViewController.swift

@@ -1,19 +1,19 @@
 import UIKit
 import R2Shared
 import R2Navigator
+import ReadiumAdapterGCDWebServer
 
 class EPUBViewController: ReaderViewController {
 
     init(
       publication: Publication,
       locator: Locator?,
-      bookId: String,
-      resourcesServer: ResourcesServer
-    ) {
-      let navigator = EPUBNavigatorViewController(
+      bookId: String
+    ) throws {
+      let navigator = try EPUBNavigatorViewController(
         publication: publication,
         initialLocation: locator,
-        resourcesServer: resourcesServer
+        httpServer: GCDHTTPServer.shared
       )
 
       super.init(
@@ -33,13 +33,11 @@ class EPUBViewController: ReaderViewController {
       super.viewDidLoad()
 
       /// Set initial UI appearance.
-      if let appearance = publication.userProperties.getProperty(reference: ReadiumCSSReference.appearance.rawValue) {
-        setUIColor(for: appearance)
-      }
+      setUIColor(for: epubNavigator.settings.theme)
     }
 
-    internal func setUIColor(for appearance: UserProperty) {
-      let colors = AssociatedColors.getColors(for: appearance)
+    internal func setUIColor(for theme: Theme) {
+      let colors = AssociatedColors.getColors(for: theme)
 
       navigator.view.backgroundColor = colors.mainColor
       view.backgroundColor = colors.mainColor

package/ios/Reader/ReaderFormatModule.swift

@@ -8,15 +8,14 @@ protocol ReaderFormatModule {
 
   var delegate: ReaderFormatModuleDelegate? { get }
 
-  /// Publication types handled by this sub-module.
-  var publicationFormats: [Publication.Format] { get }
+  /// Returns whether the given publication is supported by this module.
+  func supports(_ publication: Publication) -> Bool
 
   /// Creates the view controller to present the publication.
   func makeReaderViewController(
     for publication: Publication,
     locator: Locator?,
-    bookId: String,
-    resourcesServer: ResourcesServer
+    bookId: String
   ) throws -> ReaderViewController
 
 }

package/ios/Reader/ReaderModule.swift

@@ -20,17 +20,14 @@ protocol ReaderModuleDelegate: ModuleDelegate {}
 
 final class ReaderModule: ReaderModuleAPI {
   weak var delegate: ReaderModuleDelegate?
-  private let resourcesServer: ResourcesServer
 
   /// Sub-modules to handle different publication formats (eg. EPUB, CBZ)
   var formatModules: [ReaderFormatModule] = []
 
   init(
-    delegate: ReaderModuleDelegate?,
-    resourcesServer: ResourcesServer
+    delegate: ReaderModuleDelegate?
   ) {
     self.delegate = delegate
-    self.resourcesServer = resourcesServer
 
     formatModules = [
       // CBZModule(delegate: self),
@@ -49,7 +46,7 @@ final class ReaderModule: ReaderModuleAPI {
     locator: Locator?
   ) -> ReaderViewController? {
     guard let module = self.formatModules.first(
-      where:{ $0.publicationFormats.contains(publication.format) }
+      where:{ $0.supports(publication) }
     ) else {
       print("Unable to display the publication due to an unsupported format.")
       return nil
@@ -59,8 +56,7 @@ final class ReaderModule: ReaderModuleAPI {
       return try module.makeReaderViewController(
         for: publication,
         locator: locator,
-        bookId: bookId,
-        resourcesServer: resourcesServer
+        bookId: bookId
       )
     } catch {
       print("An unexpected error occurred when attempting to build the reader view.")

package/ios/Reader/ReaderService.swift

@@ -7,13 +7,11 @@ import UIKit
 final class ReaderService: Loggable {
   var app: AppModule?
   var streamer = Streamer()
-  var publicationServer: PublicationServer?
   private var subscriptions = Set<AnyCancellable>()
 
   init() {
     do {
       self.app = try AppModule()
-      self.publicationServer = PublicationServer()
     } catch {
       print("TODO: An error occurred instantiating the ReaderService")
       print(error)
@@ -29,11 +27,13 @@ final class ReaderService: Loggable {
     }
 
     let hasLocations = location?["locations"] != nil
+    let hasType = (location?["type"] as? String)?.isEmpty == false
     let hasChildren = location?["children"] != nil
-    let hasHashHref = (location!["href"] as! String).contains("#")
+    let hasHashHref = (location?["href"] as? String)?.contains("#") == true
+    let hasTemplated = location?["templated"] != nil
 
     // check that we're not dealing with a Link
-    if ((hasChildren || hasHashHref) && !hasLocations) {
+    if ((!hasType || hasChildren || hasHashHref || hasTemplated) && !hasLocations) {
       guard let publication = publication else {
         return nil
       }
@@ -65,7 +65,6 @@ final class ReaderService: Loggable {
           print(">>>>>>>>>>> TODO: handle me", error)
         },
         receiveValue: { pub in
-          self.preparePresentation(of: pub)
           let locator: Locator? = ReaderService.locatorFromLocation(location, pub)
           let vc = reader.getViewController(
             for: pub,
@@ -139,18 +138,4 @@ final class ReaderService: Loggable {
     }
     return .just(publication)
   }
-
-  private func preparePresentation(of publication: Publication) {
-    if (self.publicationServer == nil) {
-      log(.error, "Whoops")
-      return
-    }
-
-    publicationServer?.removeAll()
-    do {
-      try publicationServer?.add(publication)
-    } catch {
-      log(.error, error)
-    }
-  }
 }