Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crash fixes 

fixes #854
This commit is contained in:
Grishka 2024-06-23 04:45:56 +03:00
parent 6d96ab5b7c
commit 501a2715be
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/build.gradle
View File

@ -13,7 +13,7 @@ android {
applicationId "org.joinmastodon.android" applicationId "org.joinmastodon.android"
minSdk 23 minSdk 23
targetSdk 33 targetSdk 33
versionCode 103 versionCode 104
versionName "2.5.2" versionName "2.5.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

1
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@ -766,6 +766,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements ComposeE
sendingOverlay=null; sendingOverlay=null;
removeBackCallback(sendingBackButtonBlocker); removeBackCallback(sendingBackButtonBlocker);
removeBackCallback(discardConfirmationCallback); removeBackCallback(discardConfirmationCallback);
removeBackCallback(emojiKeyboardHider);
if(editingStatus==null){ if(editingStatus==null){
E.post(new StatusCreatedEvent(result, accountID)); E.post(new StatusCreatedEvent(result, accountID));
if(replyTo!=null){ if(replyTo!=null){

3
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
View File

@ -133,6 +133,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
more=findViewById(R.id.more); more=findViewById(R.id.more);
extraText=findViewById(R.id.extra_text); extraText=findViewById(R.id.extra_text);
clickableThing=findViewById(R.id.clickable_thing); clickableThing=findViewById(R.id.clickable_thing);
if(clickableThing!=null)
clickableThing.setOnClickListener(this::onAvaClick); clickableThing.setOnClickListener(this::onAvaClick);
avatar.setOutlineProvider(OutlineProviders.roundedRect(10)); avatar.setOutlineProvider(OutlineProviders.roundedRect(10));
avatar.setClipToOutline(true); avatar.setClipToOutline(true);
@ -272,9 +273,11 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
extraText.setText(item.extraText); extraText.setText(item.extraText);
} }
more.setVisibility(item.inset ? View.GONE : View.VISIBLE); more.setVisibility(item.inset ? View.GONE : View.VISIBLE);
if(clickableThing!=null){
clickableThing.setClickable(!item.inset); clickableThing.setClickable(!item.inset);
clickableThing.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct)); clickableThing.setContentDescription(item.parentFragment.getString(R.string.avatar_description, item.user.acct));
} }
}
@Override @Override
public void setImage(int index, Drawable drawable){ public void setImage(int index, Drawable drawable){

2
mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
View File

@ -550,7 +550,7 @@ public class ComposeMediaViewController{
} }
public List<String> getAttachmentIDs(){ public List<String> getAttachmentIDs(){
return attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList()); return attachments.stream().filter(a->a.serverAttachment!=null).map(a->a.serverAttachment.id).collect(Collectors.toList());
} }
public List<CreateStatus.Request.MediaAttribute> getAttachmentAttributes(){ public List<CreateStatus.Request.MediaAttribute> getAttachmentAttributes(){