Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/other_fixes

Browse Source
This commit is contained in:
Benoit Marty 2020-07-13 11:31:25 +02:00 committed by GitHub
commit 6a4d887941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -9,6 +9,7 @@ Improvements 🙌:
Bugfix 🐛: Bugfix 🐛:
- Video calls are shown as a voice ones in the timeline (#1676) - Video calls are shown as a voice ones in the timeline (#1676)
- Fix regression: not able to create a room without IS configured (#1679)
Translations 🗣: Translations 🗣:
- -

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt
View File

@ -46,7 +46,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
suspend fun build(params: CreateRoomParams): CreateRoomBody { suspend fun build(params: CreateRoomParams): CreateRoomBody {
val invite3pids = params.invite3pids val invite3pids = params.invite3pids
.takeIf { it.isNotEmpty() } .takeIf { it.isNotEmpty() }
.let { ?.let { invites ->
// This can throw Exception if Identity server is not configured // This can throw Exception if Identity server is not configured
ensureIdentityTokenTask.execute(Unit) ensureIdentityTokenTask.execute(Unit)
@ -54,7 +54,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
?: throw IdentityServiceError.NoIdentityServerConfigured ?: throw IdentityServiceError.NoIdentityServerConfigured
val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured
params.invite3pids.map { invites.map {
ThreePidInviteBody( ThreePidInviteBody(
id_server = identityServerUrlWithoutProtocol, id_server = identityServerUrlWithoutProtocol,
id_access_token = identityServerAccessToken, id_access_token = identityServerAccessToken,