Update authentication with content scanner url

tchapgouv · Feb 25, 2025 · 3d2f250 · 3d2f250
1 parent a77dbce
commit 3d2f250
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/...rc/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt b/...rc/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@@ -37,18 +37,13 @@ internal class DefaultContentUrlResolver @Inject constructor(
 
     private val baseUrl = homeServerConnectionConfig.homeServerUriBase.toString().ensureTrailingSlash()
     private val authenticatedMediaApiPath = baseUrl + NetworkConstants.URI_API_PREFIX_PATH_V1 + "media/"
-    private val mediaProxyApiPath = baseUrl + NetworkConstants.URI_API_PREFIX_PATH_MEDIA_PROXY_UNSTABLE
     override val uploadUrl = baseUrl + NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "upload"
 
     override fun resolveForDownload(contentUrl: String?, elementToDecrypt: ElementToDecrypt?): ContentUrlResolver.ResolvedMethod? {
         return if (scannerService.isScannerEnabled() && elementToDecrypt != null) {
-            val baseUrl = scannerService.getContentScannerServer()
-            val sep = if (baseUrl?.endsWith("/") == true) "" else "/"
-
-            val url = baseUrl + sep + NetworkConstants.URI_API_PREFIX_PATH_MEDIA_PROXY_UNSTABLE + "download_encrypted"
-
+            val baseUrl = scannerService.getContentScannerServer()!!.ensureTrailingSlash()
             ContentUrlResolver.ResolvedMethod.POST(
-                    url = url,
+                    url = "$baseUrl${NetworkConstants.URI_API_PREFIX_PATH_MEDIA_PROXY_UNSTABLE}download_encrypted",
                     jsonBody = ScanEncryptorUtils
                             .getDownloadBodyAndEncryptIfNeeded(scannerService.serverPublicKey, contentUrl ?: "", elementToDecrypt)
                             .toJson()
@@ -83,9 +78,8 @@ internal class DefaultContentUrlResolver @Inject constructor(
                 }
     }
 
-    override fun requiresAuthentication(resolvedUrl: String): Boolean {
-        return resolvedUrl.startsWith(mediaProxyApiPath) && isAuthenticatedMediaSupported() || resolvedUrl.startsWith(authenticatedMediaApiPath)
-    }
+    override fun requiresAuthentication(resolvedUrl: String) =
+            scannerService.isScannerEnabled() && isAuthenticatedMediaSupported() || resolvedUrl.startsWith(authenticatedMediaApiPath)
 
     private fun resolve(
             contentUrl: String,