Merge branch 'main' into pr/FineFindus/449

2023-03-15 23:42:02 +01:00
parent 5e8ede6ab8 aefa0b89ae
commit 374626cb32
43 changed files with 1010 additions and 818 deletions
--- 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+
 				'}';
 	}