Skip to content

Commit 8d412cd

Browse files
committed
Fix RoomPowerLevels with nullable event
1 parent f1a99c3 commit 8d412cd

File tree

1 file changed

+8
-2
lines changed
  • matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/powerlevels

1 file changed

+8
-2
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/powerlevels/RoomPowerLevels.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
3232
internal fun StateEventDataSource.getRoomPowerLevels(roomId: String): RoomPowerLevels {
3333
val powerLevelsEvent = getStateEvent(roomId, EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.IsEmpty)
3434
val roomCreateEvent = getStateEvent(roomId, EventType.STATE_ROOM_CREATE, QueryStringValue.IsEmpty)
35-
return createRoomPowerLevels(powerLevelsEvent = powerLevelsEvent, roomCreateEvent = roomCreateEvent)
35+
return createRoomPowerLevels(
36+
powerLevelsEvent = powerLevelsEvent,
37+
roomCreateEvent = roomCreateEvent
38+
)
3639
}
3740

3841
internal fun StateEventDataSource.getRoomPowerLevelsLive(roomId: String): LiveData<RoomPowerLevels> {
@@ -42,7 +45,10 @@ internal fun StateEventDataSource.getRoomPowerLevelsLive(roomId: String): LiveDa
4245

4346
fun emitIfReady(powerLevelEvent: Optional<Event>?, roomCreateEvent: Optional<Event>?) {
4447
if (powerLevelEvent != null && roomCreateEvent != null) {
45-
val roomPowerLevels = createRoomPowerLevels(powerLevelEvent.get(), roomCreateEvent.get())
48+
val roomPowerLevels = createRoomPowerLevels(
49+
powerLevelsEvent = powerLevelEvent.getOrNull(),
50+
roomCreateEvent = roomCreateEvent.getOrNull()
51+
)
4652
resultLiveData.postValue(roomPowerLevels)
4753
}
4854
}

0 commit comments

Comments
 (0)