From fc67c8204012540c9f835f7e051025d5a7aaf71d Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Mon, 13 Mar 2023 20:46:29 +0300
Subject: [PATCH 1/3] Fix #544

---
 .../src/main/java/org/joinmastodon/android/model/Poll.java   | 3 +++
 .../android/ui/displayitems/PollOptionStatusDisplayItem.java | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java b/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
index 037a1115b..4430bed62 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
@@ -16,6 +16,7 @@ public class Poll extends BaseModel{
 	private boolean expired;
 	public boolean multiple;
 	public int votersCount;
+	public int votesCount;
 	public boolean voted;
 	@RequiredField
 	public List<Integer> ownVotes;
@@ -41,10 +42,12 @@ public class Poll extends BaseModel{
 				", expired="+expired+
 				", multiple="+multiple+
 				", votersCount="+votersCount+
+				", votesCount="+votesCount+
 				", voted="+voted+
 				", ownVotes="+ownVotes+
 				", options="+options+
 				", emojis="+emojis+
+				", selectedOptions="+selectedOptions+
 				'}';
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
index 3c50869c6..6333f32fe 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
@@ -34,8 +34,9 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		text=HtmlParser.parseCustomEmoji(option.title, poll.emojis);
 		emojiHelper.setText(text);
 		showResults=poll.isExpired() || poll.voted;
-		if(showResults && option.votesCount!=null && poll.votersCount>0){
-			votesFraction=(float)option.votesCount/(float)poll.votersCount;
+		int total=poll.votersCount>0 ? poll.votersCount : poll.votesCount;
+		if(showResults && option.votesCount!=null && total>0){
+			votesFraction=(float)option.votesCount/(float)total;
 			int mostVotedCount=0;
 			for(Poll.Option opt:poll.options)
 				mostVotedCount=Math.max(mostVotedCount, opt.votesCount);

From d6bcc9c156746d057db1806b52ff014765919a55 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Tue, 14 Mar 2023 07:31:01 +0300
Subject: [PATCH 2/3] Fix button color

---
 .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 47a736aa5..0af92ccff 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -470,6 +470,9 @@ public class UiUtils{
 		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
 		button.setBackground(ta.getDrawable(0));
 		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
 	}
 
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback){

From 82fac1d4e7149e3d52e2f32670d6c07326ca842a Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Fri, 17 Mar 2023 16:19:38 +0100
Subject: [PATCH 3/3] fix(search): check for empty queries

Fixes an error message, which would appear, if the search query was blank.
---
 .../joinmastodon/android/fragments/discover/SearchFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
index 7f7cc3e2a..e0ed682e2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -236,7 +236,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	}
 
 	public void setQuery(String q){
-		if(Objects.equals(q, currentQuery))
+		if(Objects.equals(q, currentQuery) || q.isBlank())
 			return;
 		if(currentRequest!=null){
 			currentRequest.cancel();