Skip to content

Bring 1.21.0 back to dev - #991

Merged
SessionHero01 merged 34 commits into
devfrom
merge-1.21.0
Feb 27, 2025
Merged

Bring 1.21.0 back to dev#991
SessionHero01 merged 34 commits into
devfrom
merge-1.21.0

Conversation

@SessionHero01

Copy link
Copy Markdown
Collaborator

ThomasSession and others added 30 commits February 17, 2025 14:49
Proper way to determine if a message is a control message
Co-authored-by: mpretty-cyro <15862619+mpretty-cyro@users.noreply.github.com>
Co-authored-by: mpretty-cyro <15862619+mpretty-cyro@users.noreply.github.com>
* Making sure we update the config when reuploading an avatar as a way to keep the file server image alive

* Wrong error type

* PR feedback - cleaned up download usage
* SES-3431 no emoji reaciton on control messages

* SES-3423 Quoted messages styling

* clean up
SessionHero01 and others added 4 commits February 27, 2025 15:38
* Fix still receiving generic notification for groups

* Imports

* Fixes tests

* Fixes compile issues
* SES-3431 no emoji reaciton on control messages

* SES-3423 Quoted messages styling

* clean up

* SES 3430 - delete media dialogs

* Update conversation when attachment changes
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/components/dialogs/DeleteMediaPreviewDialog.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
#	app/src/main/java/org/thoughtcrime/securesms/dependencies/SessionUtilModule.kt
#	app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
#	app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt
@SessionHero01
SessionHero01 merged commit cffa2e1 into dev Feb 27, 2025
@SessionHero01
SessionHero01 deleted the merge-1.21.0 branch February 27, 2025 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants