ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename withDefaultSubtype to ensureDefaultSubtype

Browse Source 
The old name read as though the default subtype always replaced whatever the
receiver carried, when a mime type that already has a concrete subtype is
returned untouched.
This commit is contained in:
hayaksi1
2026-08-17 15:52:46 +03:00
parent 4c5baf8d60
commit 98ef737b1d
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
+1 -1
View File
@@ -68,7 +68,7 @@ object MimeTypes {
* A mime type with a wildcard subtype is a filter, not a media type, so replace it with a
* concrete default for its top level type.
*/
fun String?.withDefaultSubtype(): String = when {
fun String?.ensureDefaultSubtype(): String = when {
this == null -> OctetStream
hasSubtype(this) -> this
this == Images -> Jpeg
libraries/core/src/test/kotlin/io/element/android/libraries/core/mimetype/MimeTypesTest.kt
+13 -13
View File
@@ -8,28 +8,28 @@
package io.element.android.libraries.core.mimetype
import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.core.mimetype.MimeTypes.withDefaultSubtype
import io.element.android.libraries.core.mimetype.MimeTypes.ensureDefaultSubtype
import org.junit.Test
class MimeTypesTest {
@Test
fun `withDefaultSubtype keeps a mime type that already has a subtype`() {
assertThat(MimeTypes.Png.withDefaultSubtype()).isEqualTo(MimeTypes.Png)
assertThat(MimeTypes.Mp4.withDefaultSubtype()).isEqualTo(MimeTypes.Mp4)
assertThat(MimeTypes.Pdf.withDefaultSubtype()).isEqualTo(MimeTypes.Pdf)
fun `ensureDefaultSubtype keeps a mime type that already has a subtype`() {
assertThat(MimeTypes.Png.ensureDefaultSubtype()).isEqualTo(MimeTypes.Png)
assertThat(MimeTypes.Mp4.ensureDefaultSubtype()).isEqualTo(MimeTypes.Mp4)
assertThat(MimeTypes.Pdf.ensureDefaultSubtype()).isEqualTo(MimeTypes.Pdf)
}
@Test
fun `withDefaultSubtype replaces a wildcard subtype with a concrete one`() {
assertThat(MimeTypes.Images.withDefaultSubtype()).isEqualTo(MimeTypes.Jpeg)
assertThat(MimeTypes.Videos.withDefaultSubtype()).isEqualTo(MimeTypes.Mp4)
assertThat(MimeTypes.Audio.withDefaultSubtype()).isEqualTo(MimeTypes.Mp3)
fun `ensureDefaultSubtype replaces a wildcard subtype with a concrete one`() {
assertThat(MimeTypes.Images.ensureDefaultSubtype()).isEqualTo(MimeTypes.Jpeg)
assertThat(MimeTypes.Videos.ensureDefaultSubtype()).isEqualTo(MimeTypes.Mp4)
assertThat(MimeTypes.Audio.ensureDefaultSubtype()).isEqualTo(MimeTypes.Mp3)
}
@Test
fun `withDefaultSubtype falls back to octet stream`() {
assertThat(MimeTypes.Any.withDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
assertThat("text/*".withDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
assertThat(null.withDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
fun `ensureDefaultSubtype falls back to octet stream`() {
assertThat(MimeTypes.Any.ensureDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
assertThat("text/*".ensureDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
assertThat(null.ensureDefaultSubtype()).isEqualTo(MimeTypes.OctetStream)
}
}