From c3d89168020d9e5bbc01ac4f5088c494e99f99b8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 4 Jun 2020 11:40:38 +0200 Subject: [PATCH 1/2] fix param name --- .../matrix/android/internal/session/widgets/WidgetsAPI.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt index 922234a0b1..f798e7e25b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt @@ -27,7 +27,7 @@ internal interface WidgetsAPI { /** * register to the server * - * @param requestOpenIdTokenResponse the body content (Ref: https://github.com/matrix-org/matrix-doc/pull/1961) + * @param body the body content (Ref: https://github.com/matrix-org/matrix-doc/pull/1961) */ @POST("register") fun register(@Body body: RequestOpenIdTokenResponse, @Query("v") version: String?): Call From 8b7e5e527a424418fbfe9ceeb4963eb13b5973ef Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 4 Jun 2020 11:41:32 +0200 Subject: [PATCH 2/2] Make Credentials.homeServer optional because it is deprecated (#1443) It is never used currently in RiotX, but if homeserver does not sent it, it would crash. --- CHANGES.md | 1 + .../java/im/vector/matrix/android/api/auth/data/Credentials.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index cd6ffe9995..d3bca0eb06 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Improvements 🙌: Bugfix 🐛: - Switch theme is not fully taken into account without restarting the app - Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410) + - Make Credentials.homeServer optional because it is deprecated (#1443) Translations 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt index d88cd5e74d..d50ed2f46e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt @@ -45,7 +45,7 @@ data class Credentials( * @Deprecated. Clients should extract the server_name from user_id (by splitting at the first colon) * if they require it. Note also that homeserver is not spelt this way. */ - @Json(name = "home_server") val homeServer: String, + @Json(name = "home_server") val homeServer: String?, /** * ID of the logged-in device. Will be the same as the corresponding parameter in the request, if one was specified. */