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
parent 50cca2fed8
commit 3c3e872782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 24 deletions
Show stats 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); 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()); boolean hasSpoiler = !TextUtils.isEmpty(statusViewData.getSpoilerText());
if (!shouldShowContentIfSpoiler && hasSpoiler) { if (!shouldShowContentIfSpoiler && hasSpoiler) {
statusContent.setVisibility(View.GONE); statusContent.setVisibility(View.GONE);
@ -571,7 +571,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Spanned content = statusViewData.getContent(); Spanned content = statusViewData.getContent();
List<Emoji> emojis = statusViewData.getStatusEmojis(); List<Emoji> emojis = statusViewData.getStatusEmojis();
if (statusViewData.isCollapsible() && (notificationViewData.isExpanded() || !hasSpoiler)) { if (statusViewData.isCollapsible() && (statusViewData.isExpanded() || !hasSpoiler)) {
contentCollapseButton.setOnClickListener(view -> { contentCollapseButton.setOnClickListener(view -> {
int position = getAdapterPosition(); int position = getAdapterPosition();
if (position != RecyclerView.NO_POSITION && notificationActionListener != null) { if (position != RecyclerView.NO_POSITION && notificationActionListener != null) {

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

3
app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java
View file

@ -79,8 +79,7 @@ public final class ViewDataUtils {
notification.getStatus(), notification.getStatus(),
alwaysShowSensitiveData, alwaysShowSensitiveData,
alwaysOpenSpoiler alwaysOpenSpoiler
), )
false
); );
} }
} }

13
app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
View file

@ -47,15 +47,13 @@ public abstract class NotificationViewData {
private final Account account; private final Account account;
@Nullable @Nullable
private final StatusViewData.Concrete statusViewData; private final StatusViewData.Concrete statusViewData;
private final boolean isExpanded;
public Concrete(Notification.Type type, String id, Account account, public Concrete(Notification.Type type, String id, Account account,
@Nullable StatusViewData.Concrete statusViewData, boolean isExpanded) { @Nullable StatusViewData.Concrete statusViewData) {
this.type = type; this.type = type;
this.id = id; this.id = id;
this.account = account; this.account = account;
this.statusViewData = statusViewData; this.statusViewData = statusViewData;
this.isExpanded = isExpanded;
} }
public Notification.Type getType() { public Notification.Type getType() {
@ -75,10 +73,6 @@ public abstract class NotificationViewData {
return statusViewData; return statusViewData;
} }
public boolean isExpanded() {
return isExpanded;
}
@Override @Override
public long getViewDataId() { public long getViewDataId() {
return id.hashCode(); return id.hashCode();
@ -89,8 +83,7 @@ public abstract class NotificationViewData {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
Concrete concrete = (Concrete) o; Concrete concrete = (Concrete) o;
return isExpanded == concrete.isExpanded && return type == concrete.type &&
type == concrete.type &&
Objects.equals(id, concrete.id) && Objects.equals(id, concrete.id) &&
account.getId().equals(concrete.account.getId()) && account.getId().equals(concrete.account.getId()) &&
(statusViewData == concrete.statusViewData || (statusViewData == concrete.statusViewData ||
@ -101,7 +94,7 @@ public abstract class NotificationViewData {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(type, id, account, statusViewData, isExpanded); return Objects.hash(type, id, account, statusViewData);
} }
} }