Merge pull request #806 from Bubu/fix_697

call /join/{roomIdOrAlias} instead of /rooms/{roomId}/join

CHANGES.md

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

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

@@ -212,11 +212,12 @@ internal interface RoomAPI {
     /**
      * 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
      */
-    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/join")
-    fun join(@Path("roomId") roomId: String,
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
+    fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
              @Query("server_name") viaServers: List<String>,
              @Body params: Map<String, String?>): Call<Unit>