Browse Source

Merge pull request #2162 from surakin/do-not-forward-stickers

Disable forwarding for stickers (until it can be properly fixed)
pull/2169/head
Benoit Marty 9 months ago committed by GitHub
parent
commit
e752248de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
  2. 3
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt

@ -152,7 +152,11 @@ class ActionListPresenter @Inject constructor( @@ -152,7 +152,11 @@ class ActionListPresenter @Inject constructor(
add(TimelineItemAction.Reply)
}
}
add(TimelineItemAction.Forward)
// Stickers can't be forwarded (yet) so we don't show the option
// See https://github.com/element-hq/element-x-android/issues/2161
if (!timelineItem.isSticker) {
add(TimelineItemAction.Forward)
}
}
if (timelineItem.isMine && timelineItem.isTextMessage) {
add(TimelineItemAction.Edit)

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt

@ -18,6 +18,7 @@ package io.element.android.features.messages.impl.timeline.model @@ -18,6 +18,7 @@ package io.element.android.features.messages.impl.timeline.model
import androidx.compose.runtime.Immutable
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
import io.element.android.libraries.designsystem.components.avatar.AvatarData
@ -81,6 +82,8 @@ sealed interface TimelineItem { @@ -81,6 +82,8 @@ sealed interface TimelineItem {
val isTextMessage: Boolean = content is TimelineItemTextBasedContent
val isSticker: Boolean = content is TimelineItemStickerContent
val isRemote = eventId != null
}

Loading…
Cancel
Save