Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7094beab9 | ||
|
|
501a2715be |
@@ -13,8 +13,8 @@ android {
|
||||
applicationId "org.joinmastodon.android"
|
||||
minSdk 23
|
||||
targetSdk 33
|
||||
versionCode 103
|
||||
versionName "2.5.2"
|
||||
versionCode 104
|
||||
versionName "2.5.3"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
||||
@@ -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){
|
||||
|
||||
@@ -144,6 +144,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
|
||||
|
||||
@Override
|
||||
public void onDestroy(){
|
||||
removeBackCallback(exitQueryModeCallback);
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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){}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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(){
|
||||
|
||||
Reference in New Issue
Block a user