mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-22 12:08:34 +00:00
Fix ability to remove quoted message without changing message text.
Fixes a bug introduced in ff09d2267b that prevented removing a quoted message when the message text is unchanged.
This commit is contained in:
committed by
Greyson Parrelli
parent
ec65506bec
commit
d3be5807b5
@@ -330,6 +330,7 @@ import org.thoughtcrime.securesms.util.atUTC
|
|||||||
import org.thoughtcrime.securesms.util.createActivityViewModel
|
import org.thoughtcrime.securesms.util.createActivityViewModel
|
||||||
import org.thoughtcrime.securesms.util.doAfterNextLayout
|
import org.thoughtcrime.securesms.util.doAfterNextLayout
|
||||||
import org.thoughtcrime.securesms.util.fragments.requireListener
|
import org.thoughtcrime.securesms.util.fragments.requireListener
|
||||||
|
import org.thoughtcrime.securesms.util.getQuote
|
||||||
import org.thoughtcrime.securesms.util.getRecordQuoteType
|
import org.thoughtcrime.securesms.util.getRecordQuoteType
|
||||||
import org.thoughtcrime.securesms.util.hasAudio
|
import org.thoughtcrime.securesms.util.hasAudio
|
||||||
import org.thoughtcrime.securesms.util.hasGiftBadge
|
import org.thoughtcrime.securesms.util.hasGiftBadge
|
||||||
@@ -1594,7 +1595,9 @@ class ConversationFragment :
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (editMessage.body == composeText.editableText.toString()) {
|
if (editMessage.body == composeText.editableText.toString() &&
|
||||||
|
editMessage.getQuote()?.displayText?.toString() == inputPanel.quote.map { it.text }.orNull()
|
||||||
|
) {
|
||||||
Log.d(TAG, "Updated message matches original, exiting edit mode")
|
Log.d(TAG, "Updated message matches original, exiting edit mode")
|
||||||
inputPanel.exitEditMessageMode()
|
inputPanel.exitEditMessageMode()
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user