Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a267ab57 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2954-main-ics' into 'main' 

Mail: Use inferredMimeType first for attachments

See merge request !116
parents ae96e70b a67a64c5

app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java

+4 −6
Original line number Diff line number Diff line
@@ -144,13 +144,11 @@ public class AttachmentController { 


        IntentAndResolvedActivitiesCount resolvedIntentInfo;

        String mimeType = attachment.mimeType;

        if (MimeTypeUtil.isDefaultMimeType(mimeType)) {

        resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, inferredMimeType);

        } else {



        if (!resolvedIntentInfo.hasResolvedActivities() && !MimeTypeUtil.isDefaultMimeType(mimeType) &&

                !mimeType.equals(inferredMimeType)) {

            resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, mimeType);

            if (!resolvedIntentInfo.hasResolvedActivities() && !inferredMimeType.equals(mimeType)) {

                resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, inferredMimeType);

            }

        }



        if (!resolvedIntentInfo.hasResolvedActivities()) {