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

Merge branch 'fix/akkoma_media_issue_fix'

Browse Source
This commit is contained in:
LucasGGamerM
2023-09-17 10:02:14 -03:00
parent b5feab89b4 fd99879ffc
commit a6e6143157
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
View File

@@ -46,26 +46,26 @@ public class Attachment extends BaseModel{
public int getWidth(){ public int getWidth(){
if(meta==null) if(meta==null)
return 0; return 1920;
if(meta.width>0) if(meta.width>0)
return meta.width; return meta.width;
if(meta.original!=null && meta.original.width>0) if(meta.original!=null && meta.original.width>0)
return meta.original.width; return meta.original.width;
if(meta.small!=null && meta.small.width>0) if(meta.small!=null && meta.small.width>0)
return meta.small.width; return meta.small.width;
return 0; return 1920;
} }
public int getHeight(){ public int getHeight(){
if(meta==null) if(meta==null)
return 0; return 1080;
if(meta.height>0) if(meta.height>0)
return meta.height; return meta.height;
if(meta.original!=null && meta.original.height>0) if(meta.original!=null && meta.original.height>0)
return meta.original.height; return meta.original.height;
if(meta.small!=null && meta.small.height>0) if(meta.small!=null && meta.small.height>0)
return meta.small.height; return meta.small.height;
return 0; return 1080;
} }
public double getDuration(){ public double getDuration(){

4
mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java
View File

@@ -99,15 +99,11 @@ public class BlurhashCrossfadeDrawable extends Drawable{
@Override @Override
public int getIntrinsicWidth(){ public int getIntrinsicWidth(){
if(width==0)
return imageDrawable==null ? 1920 : imageDrawable.getIntrinsicWidth();
return width; return width;
} }
@Override @Override
public int getIntrinsicHeight(){ public int getIntrinsicHeight(){
if(height==0)
return imageDrawable==null ? 1080 : imageDrawable.getIntrinsicHeight();
return height; return height;
} }