StatusBaseViewHolder: semi-fix null shown up for Mastodong, don't allow user to click when parent post is unavailable

main
Alibek Omarov 4 years ago
parent 82a22082f2
commit 30b2349e2b
  1. 10
      app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
  2. 6
      app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java

@ -387,13 +387,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Context context = replyInfo.getContext(); Context context = replyInfo.getContext();
String replyToAccount = status.getInReplyToAccountAcct(); String replyToAccount = status.getInReplyToAccountAcct();
replyInfo.setText(context.getString(R.string.status_replied_to_format, replyToAccount)); replyInfo.setText(context.getString(R.string.status_replied_to_format, replyToAccount));
if (status.getParentVisible() == false) if (!status.getParentVisible()) {
replyInfo.setPaintFlags(replyInfo.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); replyInfo.setPaintFlags(replyInfo.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
else replyInfo.setOnClickListener(null);
} else {
replyInfo.setPaintFlags(replyInfo.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG)); replyInfo.setPaintFlags(replyInfo.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
replyInfo.setOnClickListener(v -> listener.onViewReplyTo(getAdapterPosition()));
replyInfo.setOnClickListener(v -> listener.onViewReplyTo(getAdapterPosition())); }
replyInfo.setVisibility(View.VISIBLE); replyInfo.setVisibility(View.VISIBLE);
} else { } else {
replyInfo.setVisibility(View.GONE); replyInfo.setVisibility(View.GONE);

@ -245,9 +245,11 @@ public abstract class StatusViewData {
return inReplyToId; return inReplyToId;
} }
@Nullable
public String getInReplyToAccountAcct() { public String getInReplyToAccountAcct() {
return inReplyToAccountAcct; if(inReplyToAccountAcct != null) {
return inReplyToAccountAcct;
}
return "";
} }
public String getSenderId() { public String getSenderId() {

Loading…
Cancel
Save