Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix state snapshot in LinkPreviewViewModelV2.

Browse Source
This commit is contained in:
Alex Hart
2023-10-02 13:59:07 -03:00
parent 4bf49df6fa
commit 913605a065
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
View File

@@ -40,7 +40,7 @@ class LinkPreviewViewModelV2(
private val linkPreviewStateStore = RxStore(savedLinkPreviewState)
val linkPreviewState: Flowable<LinkPreviewState> = linkPreviewStateStore.stateFlowable.observeOn(AndroidSchedulers.mainThread())
val linkPreviewStateSnapshot: LinkPreviewState = linkPreviewStateStore.state
val linkPreviewStateSnapshot: LinkPreviewState get() = linkPreviewStateStore.state
val hasLinkPreview: Boolean = linkPreviewStateStore.state.linkPreview.isPresent
val hasLinkPreviewUi: Boolean = linkPreviewStateStore.state.hasContent()
@@ -166,7 +166,7 @@ class LinkPreviewViewModelV2(
}
}
fun setLinkPreviewState(linkPreviewState: LinkPreviewState) {
private fun setLinkPreviewState(linkPreviewState: LinkPreviewState) {
linkPreviewStateStore.update { cleanseState(linkPreviewState) }
}

3
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationFragment.kt
View File

@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.mediasend.v2.text.send.TextStoryPostSendResult
import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
import org.thoughtcrime.securesms.stories.Stories
import org.thoughtcrime.securesms.util.activitySavedStateViewModel
import org.thoughtcrime.securesms.util.viewModel
import org.thoughtcrime.securesms.util.visible
import java.util.Optional
@@ -248,7 +247,7 @@ class TextStoryPostCreationFragment : Fragment(R.layout.stories_text_post_creati
return if (linkPreviewState.linkPreview.isPresent) {
linkPreviewState.linkPreview.get()
} else if (!linkPreviewState.activeUrlForError.isNullOrEmpty()) {
LinkPreview(linkPreviewState.activeUrlForError!!, linkPreviewState.activeUrlForError!!, "", 0L, Optional.empty())
LinkPreview(linkPreviewState.activeUrlForError, linkPreviewState.activeUrlForError, "", 0L, Optional.empty())
} else {
null
}