prevent media visibility from changing when refreshing timelines (#4319)
classic operator precendence issue closes #4317
This commit is contained in:
parent
d5eb37595c
commit
0b87ba2031
|
@ -166,7 +166,7 @@ class CachedTimelineRemoteMediator(
|
||||||
} else {
|
} else {
|
||||||
oldStatus?.expanded ?: activeAccount.alwaysOpenSpoiler
|
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
|
val contentCollapsed = oldStatus?.contentCollapsed ?: true
|
||||||
|
|
||||||
timelineDao.insertStatus(
|
timelineDao.insertStatus(
|
||||||
|
|
|
@ -76,7 +76,7 @@ class NetworkTimelineRemoteMediator(
|
||||||
s.asStatusOrNull()?.id == status.id
|
s.asStatusOrNull()?.id == status.id
|
||||||
}?.asStatusOrNull()
|
}?.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 expanded = oldStatus?.isExpanded ?: activeAccount.alwaysOpenSpoiler
|
||||||
val contentCollapsed = oldStatus?.isCollapsed ?: true
|
val contentCollapsed = oldStatus?.isCollapsed ?: true
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue