From 0b87ba2031f141afa14be3fc6b3fcc7990208bf4 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Mon, 11 Mar 2024 17:18:43 +0100 Subject: [PATCH] prevent media visibility from changing when refreshing timelines (#4319) classic operator precendence issue closes #4317 --- .../timeline/viewmodel/CachedTimelineRemoteMediator.kt | 2 +- .../timeline/viewmodel/NetworkTimelineRemoteMediator.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt index 49b77f4c8..97125b6f9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt @@ -166,7 +166,7 @@ class CachedTimelineRemoteMediator( } else { oldStatus?.expanded ?: activeAccount.alwaysOpenSpoiler } - val contentShowing = oldStatus?.contentShowing ?: activeAccount.alwaysShowSensitiveMedia || !status.actionableStatus.sensitive + val contentShowing = oldStatus?.contentShowing ?: (activeAccount.alwaysShowSensitiveMedia || !status.actionableStatus.sensitive) val contentCollapsed = oldStatus?.contentCollapsed ?: true timelineDao.insertStatus( diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt index a80ca95da..f19b2240f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt @@ -76,7 +76,7 @@ class NetworkTimelineRemoteMediator( s.asStatusOrNull()?.id == status.id }?.asStatusOrNull() - val contentShowing = oldStatus?.isShowingContent ?: activeAccount.alwaysShowSensitiveMedia || !status.actionableStatus.sensitive + val contentShowing = oldStatus?.isShowingContent ?: (activeAccount.alwaysShowSensitiveMedia || !status.actionableStatus.sensitive) val expanded = oldStatus?.isExpanded ?: activeAccount.alwaysOpenSpoiler val contentCollapsed = oldStatus?.isCollapsed ?: true