bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix sensitive media in search and notifications (#2335)

Browse source
This commit is contained in:
Konrad Pozniak 2022-02-12 09:56:08 +01:00 committed by GitHub
parent 8335a3bb3c
commit 329df1280b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
View file

@ -56,10 +56,17 @@ class SearchViewModel @Inject constructor(
private val loadedStatuses: MutableList<Pair<Status, StatusViewData.Concrete>> = mutableListOf() private val loadedStatuses: MutableList<Pair<Status, StatusViewData.Concrete>> = mutableListOf()
private val statusesPagingSourceFactory = SearchPagingSourceFactory(mastodonApi, SearchType.Status, loadedStatuses) { private val statusesPagingSourceFactory = SearchPagingSourceFactory(mastodonApi, SearchType.Status, loadedStatuses) {
it.statuses.map { status -> Pair(status, status.toViewData(alwaysShowSensitiveMedia, alwaysOpenSpoiler, true)) } it.statuses.map { status ->
.apply { val statusViewData = status.toViewData(
loadedStatuses.addAll(this) isShowingContent = alwaysShowSensitiveMedia || !status.actionableStatus.sensitive,
} isExpanded = alwaysOpenSpoiler,
isCollapsed = true
)
Pair(status, statusViewData)
}.apply {
loadedStatuses.addAll(this)
}
} }
private val accountsPagingSourceFactory = SearchPagingSourceFactory(mastodonApi, SearchType.Account) { private val accountsPagingSourceFactory = SearchPagingSourceFactory(mastodonApi, SearchType.Account) {
it.accounts it.accounts
@ -100,8 +107,7 @@ class SearchViewModel @Inject constructor(
if (loadedStatuses.remove(status)) if (loadedStatuses.remove(status))
statusesPagingSourceFactory.invalidate() statusesPagingSourceFactory.invalidate()
}, },
{ { err ->
err ->
Log.d(TAG, "Failed to delete status", err) Log.d(TAG, "Failed to delete status", err)
} }
) )

4
app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
View file

@ -185,9 +185,11 @@ public class NotificationsFragment extends SFragment implements
Notification notification = input.asRight() Notification notification = input.asRight()
.rewriteToStatusTypeIfNeeded(accountManager.getActiveAccount().getAccountId()); .rewriteToStatusTypeIfNeeded(accountManager.getActiveAccount().getAccountId());
boolean sensitiveStatus = notification.getStatus() != null && notification.getStatus().getActionableStatus().getSensitive();
return ViewDataUtils.notificationToViewData( return ViewDataUtils.notificationToViewData(
notification, notification,
alwaysShowSensitiveMedia, alwaysShowSensitiveMedia || !sensitiveStatus,
alwaysOpenSpoiler, alwaysOpenSpoiler,
true true
); );