Merge pull request #123 from readium/fix/sanitize-filename

Fix broken server if a publication file contains special characters
readium · May 7, 2020 · f022243 · f022243
2 parents 2e4337d + cae30de
commit f022243
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/r2-navigator/src/main/java/org/readium/r2/navigator/GlobalVars.kt b/r2-navigator/src/main/java/org/readium/r2/navigator/GlobalVars.kt
@@ -17,5 +17,6 @@ package org.readium.r2.navigator
 /**
  * Global Parameters
  */
+@Deprecated("Use Publication::localBaseUrlOf() instead")
 const val BASE_URL = "http://127.0.0.1"
 
diff --git a/r2-navigator/src/main/java/org/readium/r2/navigator/epub/R2EpubActivity.kt b/r2-navigator/src/main/java/org/readium/r2/navigator/epub/R2EpubActivity.kt
@@ -262,7 +262,7 @@ open class R2EpubActivity : AppCompatActivity(), IR2Activity, IR2Selectable, IR2
                     getAbsolute(spineItem.href, publicationPath)
                 }
             } else {
-                "$BASE_URL:$port" + "/" + publicationFileName + spineItem.href
+                Publication.localUrlOf(filename = publicationFileName, port = port ?: 0, href = spineItem.href)
             }
             resourcesSingle.add(Pair(resourceIndexSingle, uri))