mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-25 02:45:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash with RoomCreationParams

Browse source
This commit is contained in:
Benoit Marty 2020-01-10 18:07:14 +01:00
parent 03b5b098c7
commit 0dbca829ea
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
View file

@ -28,6 +28,8 @@ import im.vector.matrix.android.api.session.room.model.PowerLevels
import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
import im.vector.matrix.android.internal.auth.data.ThreePidMedium import im.vector.matrix.android.internal.auth.data.ThreePidMedium
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
import timber.log.Timber
/** /**
* Parameter to create a room, with facilities functions to configure it * Parameter to create a room, with facilities functions to configure it
@ -88,7 +90,7 @@ class CreateRoomParams {
* A list of state events to set in the new room. * A list of state events to set in the new room.
* This allows the user to override the default state events set in the new room. * This allows the user to override the default state events set in the new room.
* The expected format of the state events are an object with type, state_key and content keys set. * The expected format of the state events are an object with type, state_key and content keys set.
* Takes precedence over events set by presets, but gets overriden by name and topic keys. * Takes precedence over events set by presets, but gets overridden by name and topic keys.
*/ */
@Json(name = "initial_state") @Json(name = "initial_state")
var initialStates: MutableList<Event>? = null var initialStates: MutableList<Event>? = null
@ -120,14 +122,14 @@ class CreateRoomParams {
* *
* @param algorithm the algorithm * @param algorithm the algorithm
*/ */
fun addCryptoAlgorithm(algorithm: String) { fun enableEncryptionWithAlgorithm(algorithm: String) {
if (algorithm.isNotBlank()) { if (algorithm == MXCRYPTO_ALGORITHM_MEGOLM) {
val contentMap = HashMap<String, String>() val contentMap = mapOf("algorithm" to algorithm)
contentMap["algorithm"] = algorithm
val algoEvent = Event(type = EventType.STATE_ROOM_ENCRYPTION, val algoEvent = Event(
stateKey = "", type = EventType.STATE_ROOM_ENCRYPTION,
content = contentMap.toContent() stateKey = "",
content = contentMap.toContent()
) )
if (null == initialStates) { if (null == initialStates) {
@ -135,6 +137,8 @@ class CreateRoomParams {
} else { } else {
initialStates!!.add(algoEvent) initialStates!!.add(algoEvent)
} }
} else {
Timber.e("Unsupported algorithm: $algorithm")
} }
} }
@ -145,15 +149,15 @@ class CreateRoomParams {
*/ */
fun setHistoryVisibility(historyVisibility: RoomHistoryVisibility?) { fun setHistoryVisibility(historyVisibility: RoomHistoryVisibility?) {
// Remove the existing value if any. // Remove the existing value if any.
initialStates?.removeAll { it.getClearType() == EventType.STATE_ROOM_HISTORY_VISIBILITY } initialStates?.removeAll { it.type == EventType.STATE_ROOM_HISTORY_VISIBILITY }
if (historyVisibility != null) { if (historyVisibility != null) {
val contentMap = HashMap<String, RoomHistoryVisibility>() val contentMap = mapOf("history_visibility" to historyVisibility)
contentMap["history_visibility"] = historyVisibility
val historyVisibilityEvent = Event(type = EventType.STATE_ROOM_HISTORY_VISIBILITY, val historyVisibilityEvent = Event(
stateKey = "", type = EventType.STATE_ROOM_HISTORY_VISIBILITY,
content = contentMap.toContent()) stateKey = "",
content = contentMap.toContent())
if (null == initialStates) { if (null == initialStates) {
initialStates = mutableListOf(historyVisibilityEvent) initialStates = mutableListOf(historyVisibilityEvent)
@ -192,8 +196,8 @@ class CreateRoomParams {
*/ */
fun isDirect(): Boolean { fun isDirect(): Boolean {
return preset == CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT return preset == CreateRoomPreset.PRESET_TRUSTED_PRIVATE_CHAT
&& isDirect == true && isDirect == true
&& (1 == getInviteCount() || 1 == getInvite3PidCount()) && (1 == getInviteCount() || 1 == getInvite3PidCount())
} }
/** /**
@ -218,8 +222,8 @@ class CreateRoomParams {
invite3pids = ArrayList() invite3pids = ArrayList()
} }
val pid = Invite3Pid(idServer = hsConfig.identityServerUri.host!!, val pid = Invite3Pid(idServer = hsConfig.identityServerUri.host!!,
medium = ThreePidMedium.EMAIL, medium = ThreePidMedium.EMAIL,
address = id) address = id)
invite3pids!!.add(pid) invite3pids!!.add(pid)
} else if (isUserId(id)) { } else if (isUserId(id)) {