Don't add trailing slash when defining identityServerUrl at account c…

…reation
tchapgouv · Jul 21, 2023 · f261f8f · f261f8f
1 parent 5bc3c48
commit f261f8f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/changelog.d/949.fix b/changelog.d/949.fix
@@ -0,0 +1 @@
+IdentityServerUrl comporte un "/" terminal en fin d'URL qui pose problème
diff --git a/...-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt b/...-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
@@ -77,7 +77,7 @@ data class HomeServerConnectionConfig(
                 throw RuntimeException("Invalid homeserver URI: $hsUri")
             }
             // ensure trailing /
-            val hsString = hsUri.toString().ensureTrailingSlash()
+            val hsString = hsUri.toString() // .ensureTrailingSlash() // Tchap : remove
             homeServerUri = try {
                 Uri.parse(hsString)
             } catch (e: Exception) {

diff --git a/...rc/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/...rc/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -60,12 +60,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                     // This can throw an exception if identity server is not configured
                     ensureIdentityTokenTask.execute(Unit)
 
-                    var identityServerUrlWithoutProtocol = identityStore.getIdentityServerUrlWithoutProtocol()
+                    val identityServerUrlWithoutProtocol = identityStore.getIdentityServerUrlWithoutProtocol()
                             ?: throw IdentityServiceError.NoIdentityServerConfigured
-                    // Tchap : remove last char if it is a '/' else server will respond with a 500 error.
-                    if (identityServerUrlWithoutProtocol.endsWith(char = '/')) {
-                        identityServerUrlWithoutProtocol = identityServerUrlWithoutProtocol.dropLast(1)
-                    }
                     val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured
 
                     invites.map {