Merge remote-tracking branch 'upstream/master'

2023-10-06 15:17:49 +02:00
parent ee2b4b6a1f 6c1c5b7759
commit 5ea2864bd5
13 changed files with 90 additions and 14 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
@@ -68,6 +68,14 @@ public class Attachment extends BaseModel{
 		return 1080;
 	}

+	public boolean hasKnownDimensions(){
+		return meta!=null && (
+				(meta.height>0 && meta.width>0)
+				|| (meta.original!=null && meta.original.height>0 && meta.original.width>0)
+				|| (meta.small!=null && meta.small.height>0 && meta.small.width>0)
+				);
+	}
+
 	public double getDuration(){
 		if(meta==null)
 			return 0;