wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash when loading attachment metadata fails

Browse source
This commit is contained in:
cketti 2023-04-18 19:03:46 +02:00
parent 7d429d565b
commit 97ed7f6dc3
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java
View file

@ -299,9 +299,14 @@ public class AttachmentPresenter {
return;
}
attachmentMvpView.updateAttachmentView(attachment);
attachments.put(attachment.uri, attachment);
initAttachmentContentLoader(attachment);
if (attachment.state == LoadingState.METADATA) {
attachmentMvpView.updateAttachmentView(attachment);
attachments.put(attachment.uri, attachment);
initAttachmentContentLoader(attachment);
} else {
attachments.remove(attachment.uri);
attachmentMvpView.removeAttachmentView(attachment);
}
}
@Override

3
app/ui/legacy/src/main/java/com/fsck/k9/activity/misc/Attachment.java
View file

@ -156,9 +156,6 @@ public class Attachment implements Parcelable, com.fsck.k9.message.Attachment {
}
public Attachment deriveWithLoadCancelled() {
if (state != Attachment.LoadingState.METADATA) {
throw new IllegalStateException("deriveWitLoadCancelled can only be called on a METADATA attachment!");
}
return new Attachment(uri, Attachment.LoadingState.CANCELLED, loaderId, contentType, allowMessageType, name,
size, null, internalAttachment);
}