Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove multi-forward feature flag.

Browse Source
This commit is contained in:
Alex Hart
2021-08-24 10:15:11 -03:00
parent 7465818f44
commit 1a21cafe6c
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
View File

@@ -116,7 +116,7 @@ final class MenuState {
!viewOnce &&
!remoteDelete &&
!hasPendingMedia &&
((FeatureFlags.forwardMultipleMessages() && selectedParts.size() <= MAX_FORWARDABLE_COUNT) || selectedParts.size() == 1);
selectedParts.size() <= MAX_FORWARDABLE_COUNT;
int uniqueRecords = selectedParts.stream()
.map(MultiselectPart::getMessageRecord)

5
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/Multiselect.kt
View File

@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord
import org.thoughtcrime.securesms.mms.MediaConstraints
import org.thoughtcrime.securesms.mms.SlideDeck
import org.thoughtcrime.securesms.mms.TextSlide
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.Util
/**
@@ -29,10 +28,6 @@ object Multiselect {
fun getParts(conversationMessage: ConversationMessage): MultiselectCollection {
val messageRecord = conversationMessage.messageRecord
if (!FeatureFlags.forwardMultipleMessages()) {
return MultiselectCollection.Single(MultiselectPart.Message(conversationMessage))
}
if (messageRecord.isUpdate) {
return MultiselectCollection.Single(MultiselectPart.Update(conversationMessage))
}

3
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
View File

@@ -117,12 +117,9 @@ class MultiselectForwardFragment :
val shareSelectionRecycler: RecyclerView = bottomBar.findViewById(R.id.selected_list)
val shareSelectionAdapter = ShareSelectionAdapter()
val sendButton: View = bottomBar.findViewById(R.id.share_confirm)
val addMessageWrapper: View = bottomBar.findViewById(R.id.add_message_wrapper)
addMessage = bottomBar.findViewById(R.id.add_message)
addMessageWrapper.visible = FeatureFlags.forwardMultipleMessages()
sendButton.setOnClickListener {
sendButton.isEnabled = false
viewModel.send(addMessage.text.toString())