owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: fix StatusDisplayItem's compilation errors

Browse Source
This commit is contained in:
LucasGGamerM
2023-08-23 15:05:06 -03:00
parent 28601bd75c
commit 20026fc01a
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
View File

@@ -205,7 +205,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
itemView.requestLayout(); itemView.requestLayout();
reactKeyboardVisible=false; reactKeyboardVisible=false;
emojiKeyboard=new CustomEmojiPopupKeyboard(activity, AccountSessionManager.getInstance().getCustomEmojis(accountSession.domain), accountSession.domain, true); emojiKeyboard=new CustomEmojiPopupKeyboard(activity, AccountSessionManager.getInstance().getCustomEmojis(accountSession.domain), accountSession.domain, true, item.accountID);
emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){ emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
@Override @Override
public void onEmojiSelected(Emoji emoji) { public void onEmojiSelected(Emoji emoji) {

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
View File

@@ -25,7 +25,6 @@ import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
public class PollOptionStatusDisplayItem extends StatusDisplayItem{ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
private CharSequence text; private CharSequence text;
public final Poll.Option option; public final Poll.Option option;
public final Status status;
private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(); private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
private boolean showResults; private boolean showResults;
private float votesFraction; // 0..1 private float votesFraction; // 0..1
@@ -38,7 +37,6 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
this.optionIndex=optionIndex; this.optionIndex=optionIndex;
option=poll.options.get(optionIndex); option=poll.options.get(optionIndex);
this.poll=poll; this.poll=poll;
this.status=status;
text=HtmlParser.parseCustomEmoji(option.title, poll.emojis); text=HtmlParser.parseCustomEmoji(option.title, poll.emojis);
emojiHelper.setText(text); emojiHelper.setText(text);
showResults=poll.isExpired() || poll.voted; showResults=poll.isExpired() || poll.voted;

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -281,7 +281,7 @@ public abstract class StatusDisplayItem{
contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att)); contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
} }
if(att.type==Attachment.Type.UNKNOWN){ if(att.type==Attachment.Type.UNKNOWN){
contentItems.add(new FileStatusDisplayItem(parentID, fragment, att)); contentItems.add(new FileStatusDisplayItem(parentID, fragment, att, statusForContent));
} }
} }
if(statusForContent.poll!=null){ if(statusForContent.poll!=null){