filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #806 from Bubu/fix_697 

call /join/{roomIdOrAlias} instead of /rooms/{roomId}/join
This commit is contained in:
Benoit Marty 2020-01-08 18:17:34 +01:00 committed by GitHub
parent 587fefedb5 f4492e570d
commit 6ca3ba6c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -21,6 +21,7 @@ Bugfix 🐛:
- Fix crash when opening room creation screen from the room filtering screen - Fix crash when opening room creation screen from the room filtering screen
- Fix avatar image disappearing (#777) - Fix avatar image disappearing (#777)
- Fix read marker banner when permalink - Fix read marker banner when permalink
- Fix joining upgraded rooms (#697)
- Fix matrix.org room directory not being browsable (#807) - Fix matrix.org room directory not being browsable (#807)
- Hide non working settings (#751) - Hide non working settings (#751)

7
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt
View File

@ -212,11 +212,12 @@ internal interface RoomAPI {
/** /**
* Join the given room. * Join the given room.
* *
* @param roomId the room id * @param roomIdOrAlias the room id or alias
* @param server_name the servers to attempt to join the room through
* @param params the request body * @param params the request body
*/ */
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/join") @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
fun join(@Path("roomId") roomId: String, fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
@Query("server_name") viaServers: List<String>, @Query("server_name") viaServers: List<String>,
@Body params: Map<String, String?>): Call<Unit> @Body params: Map<String, String?>): Call<Unit>