Skip to content

Bring master to release/1.29.0 #1646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 28, 2025
Merged

Bring master to release/1.29.0 #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
62d258e
Bump version code
SessionHero01 Oct 27, 2025
307a081
Fix crashes when re-uploading avatar fails
SessionHero01 Oct 27, 2025
130425a
Do not crash in conversation without an address, instead take the use…
ThomasSession Oct 14, 2025
a2ebe46
Potential fixes for logout issue
SessionHero01 Oct 27, 2025
bd1b64a
Make sure we reset our observable prefs
ThomasSession Oct 14, 2025
a44f8b7
PR feedback
ThomasSession Oct 15, 2025
98af979
Bump version code to 248
SessionHero01 Oct 27, 2025
819eced
Prepare for release 1.28.2 (#1643)
SessionHero01 Oct 28, 2025
83e06d7
Merge remote-tracking branch 'origin/master' into merge-master
SessionHero01 Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
Expand Down Expand Up @@ -58,6 +59,7 @@ import org.thoughtcrime.securesms.util.castAwayType
import java.util.EnumSet
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import kotlin.math.log

private const val TAG = "ConfigToDatabaseSync"

Expand Down Expand Up @@ -93,17 +95,20 @@ class ConfigToDatabaseSync @Inject constructor(
// Sync conversations from config -> database
scope.launch {
preferences.watchLocalNumber()
.filterNotNull()
.take(1)
.flatMapLatest {
combine(
conversationRepository.conversationListAddressesFlow,
configFactory.userConfigsChanged(EnumSet.of(UserConfigType.CONVO_INFO_VOLATILE))
.castAwayType()
.onStart { emit(Unit) }
.map { _ -> configFactory.withUserConfigs { it.convoInfoVolatile.all() } },
::Pair
)
.map { it != null }
.flatMapLatest { loggedIn ->
if (loggedIn) {
combine(
conversationRepository.conversationListAddressesFlow,
configFactory.userConfigsChanged(EnumSet.of(UserConfigType.CONVO_INFO_VOLATILE))
.castAwayType()
.onStart { emit(Unit) }
.map { _ -> configFactory.withUserConfigs { it.convoInfoVolatile.all() } },
::Pair
)
} else {
emptyFlow()
}
}
.distinctUntilChanged()
.collectLatest { (conversations, convoInfo) ->
Expand Down
31 changes: 17 additions & 14 deletions app/src/main/java/org/thoughtcrime/securesms/database/BlindMappingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
Expand Down Expand Up @@ -43,21 +43,24 @@ class BlindMappingRepository @Inject constructor(
*/
@Suppress("OPT_IN_USAGE")
val mappings: StateFlow<Map<CommunityServerUrl, Map<Address.Blinded, Address.Standard>>> = prefs.watchLocalNumber()
.filterNotNull()
.flatMapLatest { localAddress ->
configFactory
.userConfigsChanged(setOf(UserConfigType.USER_GROUPS, UserConfigType.CONTACTS))
.castAwayType()
.onStart { emit(Unit) }
.map {
configFactory.withUserConfigs { configs ->
Pair(
configs.userGroups.allCommunityInfo().map { it.community },
configs.contacts.all().map { Address.Standard(AccountId(it.id)) }
+ Address.Standard(AccountId(localAddress))
)
if (localAddress.isNullOrBlank()) {
emptyFlow()
} else {
configFactory
.userConfigsChanged(setOf(UserConfigType.USER_GROUPS, UserConfigType.CONTACTS))
.castAwayType()
.onStart { emit(Unit) }
.map {
configFactory.withUserConfigs { configs ->
Pair(
configs.userGroups.allCommunityInfo().map { it.community },
configs.contacts.all().map { Address.Standard(AccountId(it.id)) }
+ Address.Standard(AccountId(localAddress))
)
}
}
}
}
}
.distinctUntilChanged()
.map { (allCommunities, allContacts) ->
Expand Down
11 changes: 8 additions & 3 deletions app/src/main/java/org/thoughtcrime/securesms/database/RecipientRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.debounce
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.filterNotNull
Expand Down Expand Up @@ -93,9 +94,13 @@ class RecipientRepository @Inject constructor(

fun observeSelf(): Flow<Recipient> {
return preferences.watchLocalNumber()
.filterNotNull()
.distinctUntilChanged()
.flatMapLatest { observeRecipient(it.toAddress()) }
.flatMapLatest {
if (it.isNullOrBlank()) {
emptyFlow()
} else {
observeRecipient(it.toAddress())
}
}
}

fun getSelf(): Recipient {
Expand Down