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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
sk
2023-01-22 03:44:30 +01:00
parent 4aaf0c4fa4 c67b2b35f3
commit f5d4e2a0b5
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/AndroidManifest.xml
View File

@@ -12,6 +12,13 @@
<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/> <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT" />
<data android:mimeType="text/plain" />
</intent>
</queries>
<application <application
android:name=".MastodonApp" android:name=".MastodonApp"
android:allowBackup="true" android:allowBackup="true"

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

@@ -47,26 +47,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(){

1
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
View File

@@ -66,6 +66,7 @@ public class PhotoStatusDisplayItem extends ImageStatusDisplayItem{
altTextScroller.setVisibility(View.GONE); altTextScroller.setVisibility(View.GONE);
altTextClose.setVisibility(View.GONE); altTextClose.setVisibility(View.GONE);
altTextButton.setVisibility(View.VISIBLE); altTextButton.setVisibility(View.VISIBLE);
altTextButton.setAlpha(1f);
if(TextUtils.isEmpty(item.attachment.description)){ if(TextUtils.isEmpty(item.attachment.description)){
altTextWrapper.setVisibility(View.GONE); altTextWrapper.setVisibility(View.GONE);
}else{ }else{