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

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

@ -445,7 +445,7 @@ public class NotificationsFragment extends SFragment implements
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
viewDataBuilder.createStatusViewData());
notifications.setPairedItem(position, newViewData);
updateAdapter();
@ -480,7 +480,7 @@ public class NotificationsFragment extends SFragment implements
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
viewDataBuilder.createStatusViewData());
notifications.setPairedItem(position, newViewData);
updateAdapter();
@ -515,7 +515,7 @@ public class NotificationsFragment extends SFragment implements
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
viewDataBuilder.createStatusViewData());
notifications.setPairedItem(position, newViewData);
updateAdapter();
@ -544,7 +544,7 @@ public class NotificationsFragment extends SFragment implements
NotificationViewData.Concrete newViewData = new NotificationViewData.Concrete(
viewdata.getType(), viewdata.getId(), viewdata.getAccount(),
viewDataBuilder.createStatusViewData(), viewdata.isExpanded());
viewDataBuilder.createStatusViewData());
notifications.setPairedItem(position, newViewData);
updateAdapter();
@ -584,7 +584,7 @@ public class NotificationsFragment extends SFragment implements
.setIsExpanded(expanded)
.createStatusViewData();
NotificationViewData notificationViewData = new NotificationViewData.Concrete(old.getType(),
old.getId(), old.getAccount(), statusViewData, expanded);
old.getId(), old.getAccount(), statusViewData);
notifications.setPairedItem(position, notificationViewData);
updateAdapter();
}
@ -598,7 +598,7 @@ public class NotificationsFragment extends SFragment implements
.setIsShowingSensitiveContent(isShowing)
.createStatusViewData();
NotificationViewData notificationViewData = new NotificationViewData.Concrete(old.getType(),
old.getId(), old.getAccount(), statusViewData, old.isExpanded());
old.getId(), old.getAccount(), statusViewData);
notifications.setPairedItem(position, notificationViewData);
updateAdapter();
}
@ -652,8 +652,7 @@ public class NotificationsFragment extends SFragment implements
concreteNotification.getType(),
concreteNotification.getId(),
concreteNotification.getAccount(),
updatedStatus,
concreteNotification.isExpanded()
updatedStatus
);
notifications.setPairedItem(position, updatedNotification);
updateAdapter();