Merge pull request #5619 from k9mail/update_kotlin (68e308d9) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ 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
		import java.util.Locale

		private const val FALLBACK_NAME = "noname"

		@@ -38,11 +37,11 @@ class BasicPartInfoExtractor {

		private fun String.toMimeValue(): MimeValue = MimeParameterDecoder.decode(this)

		private fun MimeValue.getParameter(name: String): String? = parameters[name.toLowerCase(Locale.ROOT)]
		private fun MimeValue.getParameter(name: String): String? = parameters[name.lowercase()]

		private fun String.getParameter(name: String): String? {
		val mimeValue = MimeParameterDecoder.decode(this)
		return mimeValue.parameters[name.toLowerCase(Locale.ROOT)]
		return mimeValue.parameters[name.lowercase()]
		}
		}

+5 −6

Original line number	Diff line number	Diff line
		package com.fsck.k9.message.html

		import java.util.Locale

		object UriMatcher {
		private val SUPPORTED_URIS = { httpUriParser: HttpUriParser ->
		private val SUPPORTED_URIS = run {
		val httpUriParser = HttpUriParser()
		mapOf(
		"ethereum:" to EthereumUriParser(),
		"bitcoin:" to BitcoinUriParser(),
		@@ -11,7 +10,7 @@ object UriMatcher {
		"https:" to httpUriParser,
		"rtsp:" to httpUriParser
		)
		}.invoke(HttpUriParser())
		}

		private const val SCHEME_SEPARATORS = "\\s(\\n<"
		private const val ALLOWED_SEPARATORS_PATTERN = "(?:^\|[$SCHEME_SEPARATORS])"
		@@ -23,8 +22,8 @@ object UriMatcher {
		fun findUris(text: CharSequence): List<UriMatch> {
		return URI_SCHEME.findAll(text).map { matchResult ->
		val matchGroup = matchResult.groups[1]!!
		val startIndex = matchGroup.range.start
		val scheme = matchGroup.value.toLowerCase(Locale.ROOT)
		val startIndex = matchGroup.range.first
		val scheme = matchGroup.value.lowercase()
		val parser = SUPPORTED_URIS[scheme] ?: throw AssertionError("Scheme not found: $scheme")

		parser.parseUri(text, startIndex)

+1 −3

Original line number	Diff line number	Diff line
		package com.fsck.k9.preferences

		import java.util.Locale

		object ServerTypeConverter {
		@JvmStatic
		fun toServerSettingsType(exportType: String): String = exportType.toLowerCase(Locale.ROOT)
		fun toServerSettingsType(exportType: String): String = exportType.lowercase()

		@JvmStatic
		fun fromServerSettingsType(serverSettingsType: String): String = when (serverSettingsType) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import java.io.FileInputStream
		import java.io.FileOutputStream
		import java.io.IOException
		import java.io.InputStream
		import java.util.Locale
		import java.util.Stack
		import java.util.UUID
		import org.apache.commons.io.IOUtils
		@@ -355,7 +354,7 @@ internal class SaveMessageOperations(

		private fun getTransferEncoding(part: Part): String {
		val contentTransferEncoding = part.getHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING).firstOrNull()
		return contentTransferEncoding?.toLowerCase(Locale.ROOT) ?: MimeUtil.ENC_7BIT
		return contentTransferEncoding?.lowercase() ?: MimeUtil.ENC_7BIT
		}

		private fun addChildrenToStack(stack: Stack<PartContainer>, part: Part, parentId: Long) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ import android.database.sqlite.SQLiteDatabase
		import com.fsck.k9.helper.Utility
		import com.fsck.k9.mail.Message
		import com.fsck.k9.mail.message.MessageHeaderParser
		import java.util.Locale

		internal class ThreadMessageOperations {

		@@ -37,7 +36,7 @@ internal class ThreadMessageOperations {
		var referencesHeader: String? = null
		if (headerBytes != null) {
		MessageHeaderParser.parse(headerBytes.inputStream()) { name, value ->
		when (name.toLowerCase(Locale.ROOT)) {
		when (name.lowercase()) {
		"in-reply-to" -> inReplyToHeader = value
		"references" -> referencesHeader = value
		}