chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

fix content warning in notifications when alwaysShowSpoiler is on (#1757)

Browse source
This commit is contained in:
Konrad Pozniak 2020-04-18 13:45:07 +02:00 • committed by GitHub
commit 3c3e872782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View file

@ -516,7 +516,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
statusContent.setVisibility(statusViewData.isExpanded() ? View.GONE : View.VISIBLE);
});
setupContentAndSpoiler(notificationViewData, listener);
setupContentAndSpoiler(listener);
}
}
@ -558,9 +558,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
}
}
private void setupContentAndSpoiler(NotificationViewData.Concrete notificationViewData, final LinkListener listener) {
private void setupContentAndSpoiler(final LinkListener listener) {
boolean shouldShowContentIfSpoiler = notificationViewData.isExpanded();
boolean shouldShowContentIfSpoiler = statusViewData.isExpanded();
boolean hasSpoiler = !TextUtils.isEmpty(statusViewData.getSpoilerText());
if (!shouldShowContentIfSpoiler && hasSpoiler) {
statusContent.setVisibility(View.GONE);
@ -571,7 +571,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Spanned content = statusViewData.getContent();
List<Emoji> emojis = statusViewData.getStatusEmojis();
if (statusViewData.isCollapsible() && (notificationViewData.isExpanded() || !hasSpoiler)) {
if (statusViewData.isCollapsible() && (statusViewData.isExpanded() || !hasSpoiler)) {
contentCollapseButton.setOnClickListener(view -> {
int position = getAdapterPosition();
if (position != RecyclerView.NO_POSITION && notificationActionListener != null) {