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

Unverified Commit 7135afb1 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6054 from k9mail/move_mime_type_handling

Move MIME type utility functions to `:k9mail:app:core`
parents 4cbd8424 ad337c03
Loading
Loading
Loading
Loading
+925 −0

File added.

Preview size limit exceeded, changes collapsed.

+4 −4
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ package com.fsck.k9.mailstore;

import android.net.Uri;

import com.fsck.k9.helper.MimeTypeUtil;
import com.fsck.k9.mail.Part;
import com.fsck.k9.mail.internet.MimeUtility;


public class AttachmentViewInfo {
@@ -48,8 +48,8 @@ public class AttachmentViewInfo {
            return false;
        }

        return MimeUtility.isSupportedImageType(mimeType) || (
                MimeUtility.isSameMimeType(MimeUtility.DEFAULT_ATTACHMENT_MIME_TYPE, mimeType) &&
                MimeUtility.isSupportedImageExtension(displayName));
        return MimeTypeUtil.isSupportedImageType(mimeType) || (
                MimeTypeUtil.isSameMimeType(MimeTypeUtil.DEFAULT_ATTACHMENT_MIME_TYPE, mimeType) &&
                MimeTypeUtil.isSupportedImageExtension(displayName));
    }
}
+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import android.net.Uri;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;

import com.fsck.k9.helper.MimeTypeUtil;
import timber.log.Timber;
import androidx.annotation.WorkerThread;

@@ -120,7 +121,7 @@ public class AttachmentInfoExtractor {
        if (name == null) {
            String extension = null;
            if (mimeType != null) {
                extension = MimeUtility.getExtensionByMimeType(mimeType);
                extension = MimeTypeUtil.getExtensionByMimeType(mimeType);
            }
            name = "noname" + ((extension != null) ? "." + extension : "");
        }
+2 −2
Original line number Diff line number Diff line
package com.fsck.k9.message.extractors

import com.fsck.k9.helper.MimeTypeUtil
import com.fsck.k9.mail.Part
import com.fsck.k9.mail.internet.MimeParameterDecoder
import com.fsck.k9.mail.internet.MimeUtility
import com.fsck.k9.mail.internet.MimeValue

private const val FALLBACK_NAME = "noname"
@@ -31,7 +31,7 @@ class BasicPartInfoExtractor {
    }

    private fun String?.toDisplayName(): String {
        val extension = this?.let { mimeType -> MimeUtility.getExtensionByMimeType(mimeType) }
        val extension = this?.let { mimeType -> MimeTypeUtil.getExtensionByMimeType(mimeType) }
        return if (extension.isNullOrEmpty()) FALLBACK_NAME else "$FALLBACK_NAME.$extension"
    }

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.fsck.k9.DI;
import com.fsck.k9.helper.MimeTypeUtil;
import com.fsck.k9.mailstore.LocalStoreProvider;
import timber.log.Timber;

import com.fsck.k9.Account;
import com.fsck.k9.Preferences;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mailstore.LocalStore;
import com.fsck.k9.mailstore.LocalStore.AttachmentInfo;
import org.openintents.openpgp.util.OpenPgpApi.OpenPgpDataSource;
@@ -156,7 +156,7 @@ public class AttachmentProvider extends ContentProvider {
            }
        } catch (MessagingException e) {
            Timber.e(e, "Unable to retrieve LocalStore for %s", account);
            type = MimeUtility.DEFAULT_ATTACHMENT_MIME_TYPE;
            type = MimeTypeUtil.DEFAULT_ATTACHMENT_MIME_TYPE;
        }

        return type;
Loading