mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-23 12:38:33 +00:00
CFV2 Add edit message support.
This commit is contained in:
committed by
Cody Henthorne
parent
5d546f46e4
commit
e41dd6d39d
@@ -1174,7 +1174,22 @@ class ConversationFragment : LoggingFragment(R.layout.v2_conversation_fragment)
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun handleEditMessage(conversationMessage: ConversationMessage) {
|
private fun handleEditMessage(conversationMessage: ConversationMessage) {
|
||||||
// TODO [cfv2] -- Not implemented yet.
|
if (!FeatureFlags.editMessageSending()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
TODO [cfv2]
|
||||||
|
if (isSearchRequested) {
|
||||||
|
searchViewItem.collapseActionView();
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
viewModel.resolveMessageToEdit(conversationMessage)
|
||||||
|
.subscribeBy { updatedMessage ->
|
||||||
|
inputPanel.enterEditMessageMode(GlideApp.with(this), updatedMessage, false)
|
||||||
|
}
|
||||||
|
.addTo(disposables)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleForwardMessageParts(messageParts: Set<MultiselectPart>) {
|
private fun handleForwardMessageParts(messageParts: Set<MultiselectPart>) {
|
||||||
|
|||||||
@@ -480,6 +480,10 @@ class ConversationRepository(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun resolveMessageToEdit(conversationMessage: ConversationMessage): Single<ConversationMessage> {
|
||||||
|
return oldConversationRepository.resolveMessageToEdit(conversationMessage)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Glide target for a contact photo which expects an error drawable, and publishes
|
* Glide target for a contact photo which expects an error drawable, and publishes
|
||||||
* the result to the given emitter.
|
* the result to the given emitter.
|
||||||
|
|||||||
@@ -295,4 +295,8 @@ class ConversationViewModel(
|
|||||||
fun getSlideDeckAndBodyForReply(context: Context, conversationMessage: ConversationMessage): Pair<SlideDeck, CharSequence> {
|
fun getSlideDeckAndBodyForReply(context: Context, conversationMessage: ConversationMessage): Pair<SlideDeck, CharSequence> {
|
||||||
return repository.getSlideDeckAndBodyForReply(context, conversationMessage)
|
return repository.getSlideDeckAndBodyForReply(context, conversationMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun resolveMessageToEdit(conversationMessage: ConversationMessage): Single<ConversationMessage> {
|
||||||
|
return repository.resolveMessageToEdit(conversationMessage)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user