prevent media visibility from changing when refreshing timelines (#4319)

classic operator precendence issue closes #4317
2 years ago · 0b87ba2031
2 changed files with 2 additions and 2 deletions
--- 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(
--- 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