mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 14:38:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

#1682: parse "default_server_config"

Browse source
This commit is contained in:
Benoit Marty 2020-08-17 19:27:13 +02:00
parent 1b9b18851d
commit c11c28b406
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
View file

@ -176,10 +176,11 @@ internal class DefaultAuthenticationService @Inject constructor(
} }
} }
.map { riotConfig -> .map { riotConfig ->
if (riotConfig.defaultHomeServerUrl?.isNotBlank() == true) { val defaultHomeServerUrl = riotConfig.getPreferredHomeServerUrl()
if (defaultHomeServerUrl?.isNotEmpty() == true) {
// Ok, good sign, we got a default hs url // Ok, good sign, we got a default hs url
val newHomeServerConnectionConfig = homeServerConnectionConfig.copy( val newHomeServerConnectionConfig = homeServerConnectionConfig.copy(
homeServerUri = Uri.parse(riotConfig.defaultHomeServerUrl) homeServerUri = Uri.parse(defaultHomeServerUrl)
) )
val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig) val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig)
@ -188,7 +189,7 @@ internal class DefaultAuthenticationService @Inject constructor(
apiCall = newAuthAPI.versions() apiCall = newAuthAPI.versions()
} }
getLoginFlowResult(newAuthAPI, versions, riotConfig.defaultHomeServerUrl) getLoginFlowResult(newAuthAPI, versions, defaultHomeServerUrl)
} else { } else {
// Config exists, but there is no default homeserver url (ex: https://riot.im/app) // Config exists, but there is no default homeserver url (ex: https://riot.im/app)
throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */) throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */)

28
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
View file

@ -22,8 +22,30 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class RiotConfig( data class RiotConfig(
// There are plenty of other elements in the file config.json of a RiotWeb client, but for the moment only one is interesting /**
// Ex: "brand", "branding", etc. * This is now deprecated, but still used first, rather than value from "default_server_config"
*/
@Json(name = "default_hs_url") @Json(name = "default_hs_url")
val defaultHomeServerUrl: String? val defaultHomeServerUrl: String?,
@Json(name = "default_server_config")
val defaultServerConfig: RiotConfigDefaultServerConfig?
) {
fun getPreferredHomeServerUrl(): String? {
return defaultHomeServerUrl
?.takeIf { it.isNotEmpty() }
?: defaultServerConfig?.homeServer?.baseURL
}
}
@JsonClass(generateAdapter = true)
data class RiotConfigDefaultServerConfig(
@Json(name = "m.homeserver")
val homeServer: RiotConfigBaseConfig? = null
)
@JsonClass(generateAdapter = true)
data class RiotConfigBaseConfig(
@Json(name = "base_url")
val baseURL: String? = null
) )