Fixes direct messages falsely being shown as able to be boosted.

main
Vavassor 7 years ago
parent d8a5ec3132
commit 88df8216a6
  1. 2
      app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
  2. 10
      app/src/main/java/com/keylesspalace/tusky/entity/Status.java

@ -382,7 +382,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
hideSensitiveMediaWarning(); hideSensitiveMediaWarning();
} }
setupButtons(listener, realStatus.account.id); setupButtons(listener, realStatus.account.id);
setRebloggingEnabled(realStatus.visibility != Status.Visibility.PRIVATE); setRebloggingEnabled(status.rebloggingAllowed());
if (realStatus.spoilerText.isEmpty()) { if (realStatus.spoilerText.isEmpty()) {
hideSpoilerText(); hideSpoilerText();
} else { } else {

@ -47,12 +47,15 @@ public class Status {
} }
public enum Visibility { public enum Visibility {
UNKNOWN,
@SerializedName("public") @SerializedName("public")
PUBLIC, PUBLIC,
@SerializedName("unlisted") @SerializedName("unlisted")
UNLISTED, UNLISTED,
@SerializedName("private") @SerializedName("private")
PRIVATE, PRIVATE,
@SerializedName("direct")
DIRECT,
} }
public String id; public String id;
@ -81,6 +84,13 @@ public class Status {
return visibility == null ? Visibility.UNLISTED : visibility; return visibility == null ? Visibility.UNLISTED : visibility;
} }
public boolean rebloggingAllowed() {
return visibility != null
&& visibility != Visibility.PRIVATE
&& visibility != Visibility.DIRECT
&& visibility != Visibility.UNKNOWN;
}
@SerializedName("media_attachments") @SerializedName("media_attachments")
public MediaAttachment[] attachments; public MediaAttachment[] attachments;

Loading…
Cancel
Save