Compare commits

...

2 Commits

Author SHA1 Message Date
Grishka
e7094beab9 More crash fixes 2024-06-23 04:54:43 +03:00
Grishka
501a2715be Crash fixes
fixes #854
2024-06-23 04:45:56 +03:00
7 changed files with 19 additions and 6 deletions

View File

@@ -13,8 +13,8 @@ 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.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

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

View File

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

View File

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

View File

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

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

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