notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge branch 'master' into donations

Browse source 
# Conflicts:
#	mastodon/build.gradle
This commit is contained in:
Grishka 2024-06-23 04:57:02 +03:00
commit 88c0985908
6 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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;
removeBackCallback(sendingBackButtonBlocker);
removeBackCallback(discardConfirmationCallback);
removeBackCallback(emojiKeyboardHider);
if(editingStatus==null){
E.post(new StatusCreatedEvent(result, accountID));
if(replyTo!=null){

1
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
View file

@ -144,6 +144,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
@Override
public void onDestroy(){
removeBackCallback(exitQueryModeCallback);
super.onDestroy();
}

2
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
View file

@ -100,6 +100,8 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
.setCallback(new Callback<>(){
@Override
public void onSuccess(List<CatalogInstance> result){
if(getActivity()==null)
return;
data.clear();
data.addAll(sortInstances(result));
updateFilteredList();

6
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java
View file

@ -97,6 +97,12 @@ public class EditFilterFragment extends BaseSettingsFragment<Void>{
setRetainInstance(true);
}
@Override
public void onDestroy(){
removeBackCallback(confirmCallback);
super.onDestroy();
}
@Override
protected void doLoadData(int offset, int count){}

9
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
View file

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

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(){
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(){