Fix PR comments
This commit is contained in:
parent
369c0f166d
commit
e7f3cf6d57
|
@ -138,19 +138,15 @@ class TimelineItemFactory @Inject constructor(
|
||||||
// Crypto
|
// Crypto
|
||||||
EventType.ENCRYPTED -> {
|
EventType.ENCRYPTED -> {
|
||||||
val relationContent = event.getRelationContent()
|
val relationContent = event.getRelationContent()
|
||||||
if (event.root.isRedacted()) {
|
when {
|
||||||
// Redacted event, let the MessageItemFactory handle it
|
// Redacted event, let the MessageItemFactory handle it
|
||||||
messageItemFactory.create(params)
|
event.root.isRedacted() -> messageItemFactory.create(params)
|
||||||
} else if (relationContent?.type == RelationType.REFERENCE) {
|
relationContent?.type == RelationType.REFERENCE -> {
|
||||||
// Hide the decryption error for VoiceBroadcast chunks
|
// Hide the decryption error for VoiceBroadcast chunks
|
||||||
val startEvent = relationContent.eventId?.let { session.getRoom(event.roomId)?.getTimelineEvent(it) }
|
val relatedEvent = relationContent.eventId?.let { session.getRoom(event.roomId)?.getTimelineEvent(it) }
|
||||||
if (startEvent?.isVoiceBroadcast() == false) {
|
if (relatedEvent?.isVoiceBroadcast() != true) encryptedItemFactory.create(params) else null
|
||||||
encryptedItemFactory.create(params)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
}
|
||||||
} else {
|
else -> encryptedItemFactory.create(params)
|
||||||
encryptedItemFactory.create(params)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EventType.KEY_VERIFICATION_CANCEL,
|
EventType.KEY_VERIFICATION_CANCEL,
|
||||||
|
|
|
@ -137,18 +137,22 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageVoiceBroadcastItem
|
||||||
|
|
||||||
private fun renderPlaybackError(holder: Holder, playbackState: State) {
|
private fun renderPlaybackError(holder: Holder, playbackState: State) {
|
||||||
with(holder) {
|
with(holder) {
|
||||||
if (playbackState is State.Error) {
|
when {
|
||||||
|
playbackState is State.Error -> {
|
||||||
controlsGroup.isVisible = false
|
controlsGroup.isVisible = false
|
||||||
errorView.setTextOrHide(errorFormatter.toHumanReadable(playbackState.failure))
|
errorView.setTextOrHide(errorFormatter.toHumanReadable(playbackState.failure))
|
||||||
} else if (playbackState is State.Idle && hasUnableToDecryptEvent) {
|
}
|
||||||
|
playbackState is State.Idle && hasUnableToDecryptEvent -> {
|
||||||
controlsGroup.isVisible = false
|
controlsGroup.isVisible = false
|
||||||
errorView.setTextOrHide(errorFormatter.toHumanReadable(VoiceBroadcastFailure.ListeningError.UnableToDecrypt))
|
errorView.setTextOrHide(errorFormatter.toHumanReadable(VoiceBroadcastFailure.ListeningError.UnableToDecrypt))
|
||||||
} else {
|
}
|
||||||
|
else -> {
|
||||||
errorView.isVisible = false
|
errorView.isVisible = false
|
||||||
controlsGroup.isVisible = true
|
controlsGroup.isVisible = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun bindSeekBar(holder: Holder) {
|
private fun bindSeekBar(holder: Holder) {
|
||||||
with(holder) {
|
with(holder) {
|
||||||
|
|
|
@ -146,7 +146,9 @@ class GetLiveVoiceBroadcastChunksUseCase @Inject constructor(
|
||||||
it.isVoiceBroadcast() && it.getVoiceBroadcastEventId() == voiceBroadcastId && it.root.senderId == senderId
|
it.isVoiceBroadcast() && it.getVoiceBroadcastEventId() == voiceBroadcastId && it.root.senderId == senderId
|
||||||
}?.root
|
}?.root
|
||||||
}
|
}
|
||||||
event.getClearType() == EventType.ENCRYPTED && relationContent?.type == RelationType.REFERENCE -> event
|
event.getClearType() == EventType.ENCRYPTED && relationContent?.type == RelationType.REFERENCE -> {
|
||||||
|
event.takeIf { relationContent.eventId == voiceBroadcastId }
|
||||||
|
}
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue