From 134ac2b2fd5beb7fdad3998902a932aa67cddf7f Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 13 Mar 2024 09:48:47 -0300
Subject: [PATCH] Fix display name resolution for my story.

---
 .../thoughtcrime/securesms/stories/my/MyStoriesRepository.kt   | 2 +-
 .../thoughtcrime/securesms/stories/my/MyStoriesViewModel.kt    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesRepository.kt
index dc5ee98d7f..acbabe3902 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesRepository.kt
@@ -41,7 +41,7 @@ class MyStoriesRepository(context: Context) {
 
   private fun createDistributionSet(recipient: Recipient, messageRecords: List<MessageRecord>): MyStoriesState.DistributionSet {
     return MyStoriesState.DistributionSet(
-      label = recipient.getDisplayName(context),
+      label = recipient.resolve().getDisplayName(context),
       stories = messageRecords.map { record ->
         MyStoriesState.DistributionStory(
           message = ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, record, recipient),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesViewModel.kt
index c502938709..b62a38a309 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.util.livedata.Store
 
@@ -17,7 +18,7 @@ class MyStoriesViewModel(private val repository: MyStoriesRepository) : ViewMode
   val state: LiveData<MyStoriesState> = store.stateLiveData
 
   init {
-    disposables += repository.getMyStories().subscribe { distributionSets ->
+    disposables += repository.getMyStories().observeOn(Schedulers.io()).subscribe { distributionSets ->
       store.update { it.copy(distributionSets = distributionSets) }
     }
   }