Bring master to release/1.29.0 #1646
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
SessionHero01
commented
Oct 28, 2025
SessionHero01
commented
- Bump version code
- Fix crashes when re-uploading avatar fails
- Do not crash in conversation without an address, instead take the user back home
- Potential fixes for logout issue
- Make sure we reset our observable prefs
- PR feedback
- Bump version code to 248
…r back home (cherry picked from commit 1e05b7a)
(cherry picked from commit 3ef4235)
(cherry picked from commit 480523d)
* Bump version code * Fix crashes when re-uploading avatar fails * Do not crash in conversation without an address, instead take the user back home (cherry picked from commit 1e05b7a) * Potential fixes for logout issue * Make sure we reset our observable prefs (cherry picked from commit 3ef4235) * PR feedback (cherry picked from commit 480523d) * Bump version code to 248 --------- Co-authored-by: ThomasSession <thomas.r@getsession.org>
# Conflicts: # app/build.gradle.kts # app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt # app/src/main/java/org/thoughtcrime/securesms/attachments/AvatarUploadManager.kt
ThomasSession
approved these changes
Oct 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.