Skip to content

Commit

Permalink
Enable threads on develop
Browse files Browse the repository at this point in the history
  • Loading branch information
yostyle committed Sep 26, 2023
1 parent 00d1f02 commit 569a215
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion vector-config/src/devTchap/res/values/config-features.xml
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>
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

0 comments on commit 569a215

Please sign in to comment.