Merge pull request #1584 from session-foundation/release/1.28.1

1.28.1 into dev

Author: SessionHero01

app/build.gradle.kts

@@ -26,7 +26,7 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 424
+val canonicalVersionCode = 426
 val canonicalVersionName = "1.28.1"
 
 val postFixSize = 10

app/src/main/java/org/thoughtcrime/securesms/attachments/AvatarUploadManager.kt

@@ -191,7 +191,11 @@ class AvatarUploadManager @Inject constructor(
             val result = it.userProfile.getPic()
             val userPic = remoteFile.toUserPic()
             if (isReupload) {
-                it.userProfile.setReuploadedPic(userPic)
+                it.userProfile.setPic(userPic)
+
+                // TODO: We'll need to call this when the libsession re-enables the re-uploaded
+                // avatar logic.
+                // it.userProfile.setReuploadedPic(userPic)
             } else {
                 it.userProfile.setPic(userPic)
             }

app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
@@ -226,12 +225,13 @@ class DefaultConversationRepository @Inject constructor(
                                 it == TextSecurePreferences.SET_FORCE_POST_PRO
                     }
                 ).debounce(500)
-                    .onStart { emit(Unit) }
-                    .mapLatest {
-                        withContext(Dispatchers.Default) {
-                            threadDb.getThreads(allAddresses)
-                        }
-                    }
+                    .onStart { emit(allAddresses) }
+                    .map { allAddresses }
+            }
+            .map { addresses ->
+                withContext(Dispatchers.Default) {
+                    threadDb.getThreads(addresses)
+                }
             }
     }