Fix poll expiration

fixes #238, fixes #417
2022-11-26 20:13:46 +03:00
parent 2cabe94ba0
commit 62411a563f
3 changed files with 9 additions and 5 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Poll.java
@@ -13,7 +13,7 @@ public class Poll extends BaseModel{
 	@RequiredField
 	public String id;
 	public Instant expiresAt;
-	public boolean expired;
+	private boolean expired;
 	public boolean multiple;
 	public int votersCount;
 	public boolean voted;
@@ -48,6 +48,10 @@ public class Poll extends BaseModel{
 				'}';
 	}

+	public boolean isExpired(){
+		return expired || expiresAt.isBefore(Instant.now());
+	}
+
 	@Parcel
 	public static class Option{
 		public String title;