mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-04-06 07:00:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a crash when adding a media

Browse source
This commit is contained in:
Thomas 2025-03-06 10:16:16 +01:00
parent 65dea8bf56
commit ab30fc7bf2
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
View file

@ -1152,15 +1152,17 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
StatusesVM statusesVM = new ViewModelProvider((ViewModelStoreOwner) context).get(StatusesVM.class);
statusesVM.getAttachment(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, attachment.id)
.observe((LifecycleOwner) context, attachmentReceived -> {
List<Attachment> attachments = statusList.get(position).media_attachments;
for(Attachment attach : attachments) {
if(attach.id.equals(attachment.id)) {
statusList.get(position).media_attachments.remove(attachment);
break;
if(attachmentReceived != null) {
List<Attachment> attachments = statusList.get(position).media_attachments;
for(Attachment attach : attachments) {
if(attach.id != null && attach.id.equals(attachment.id)) {
statusList.get(position).media_attachments.remove(attachment);
break;
}
}
statusList.get(position).media_attachments.add(attachmentReceived);
notifyItemChanged(position);
}
statusList.get(position).media_attachments.add(attachmentReceived);
notifyItemChanged(position);
});
}
ComposeAttachmentItemBinding composeAttachmentItemBinding = ComposeAttachmentItemBinding.inflate(LayoutInflater.from(context), holder.binding.attachmentsList, false);

4
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDraftAdapter.java
View file

@ -135,9 +135,9 @@ public class StatusDraftAdapter extends RecyclerView.Adapter<StatusDraftAdapter.
}
}
//If there are media, we need to remove them first.
if (attachments.size() > 0) {
if (!attachments.isEmpty()) {
for (Attachment attachment : attachments) {
if (attachment.local_path != null) {
if (attachment != null && attachment.local_path != null) {
File fileToDelete = new File(attachment.local_path);
if (fileToDelete.exists()) {
//noinspection ResultOfMethodCallIgnored