Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable threads on develop #972

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Enable threads on develop #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vector-config/src/devTchap/res/values/config-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<resources>
<bool name="tchap_is_cross_signing_enabled">true</bool>
<bool name="tchap_is_key_backup_enabled">true</bool>
<bool name="tchap_is_thread_enabled">false</bool>
<bool name="tchap_is_thread_enabled">true</bool>
</resources>
4 changes: 3 additions & 1 deletion ...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import im.vector.app.core.extensions.getVectorLastMessageContent
import im.vector.app.core.platform.EmptyViewEvents
import im.vector.app.core.platform.VectorViewModel
import im.vector.app.core.resources.StringProvider
import im.vector.app.features.VectorFeatures
import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
import im.vector.app.features.html.EventHtmlRenderer
import im.vector.app.features.html.PillsPostProcessor
Expand Down Expand Up @@ -81,6 +82,7 @@ class MessageActionsViewModel @AssistedInject constructor(
private val stringProvider: StringProvider,
private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
private val vectorPreferences: VectorPreferences,
private val vectorFeatures: VectorFeatures,
private val checkIfCanReplyEventUseCase: CheckIfCanReplyEventUseCase,
private val checkIfCanRedactEventUseCase: CheckIfCanRedactEventUseCase,
) : VectorViewModel<MessageActionState, MessageActionsAction, EmptyViewEvents>(initialState) {
Expand Down Expand Up @@ -456,7 +458,7 @@ class MessageActionsViewModel @AssistedInject constructor(
// We let reply in thread visible even if threads are not enabled, with an enhanced flow to attract users

// Tchap: don't show the canReplyInThread quick action if it's not enable in the labs
if (!vectorPreferences.areThreadMessagesEnabled()) return false
if (!vectorFeatures.tchapIsThreadEnabled()) return false

// Disable beta prompt if the homeserver do not support threads
if (!vectorPreferences.areThreadMessagesEnabled() &&
Expand Down
Loading