Parcelize: Always map primitive array element types as boxed types for Array<T> (#KT-23808)
This commit is contained in:
+1
-1
@@ -113,7 +113,7 @@ interface ParcelSerializer {
|
|||||||
|
|
||||||
asmType.sort == Type.ARRAY -> {
|
asmType.sort == Type.ARRAY -> {
|
||||||
val elementType = type.builtIns.getArrayElementType(type)
|
val elementType = type.builtIns.getArrayElementType(type)
|
||||||
val elementSerializer = get(elementType, typeMapper.mapTypeSafe(elementType, forceBoxed = false), context, strict = strict())
|
val elementSerializer = get(elementType, typeMapper.mapTypeSafe(elementType, forceBoxed = true), context, strict = strict())
|
||||||
|
|
||||||
wrapToNullAwareIfNeeded(type, ArrayParcelSerializer(asmType, elementSerializer))
|
wrapToNullAwareIfNeeded(type, ArrayParcelSerializer(asmType, elementSerializer))
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -55,6 +55,7 @@ class ParcelBoxTest : AbstractParcelBoxTest() {
|
|||||||
fun testCustomSerializerBoxing() = doTest("customSerializerBoxing")
|
fun testCustomSerializerBoxing() = doTest("customSerializerBoxing")
|
||||||
fun testKt20717() = doTest("kt20717")
|
fun testKt20717() = doTest("kt20717")
|
||||||
fun testEnumObject() = doTest("enumObject")
|
fun testEnumObject() = doTest("enumObject")
|
||||||
|
fun testIntArray() = doTest("intArray")
|
||||||
}
|
}
|
||||||
|
|
||||||
class ParcelBoxTestWithSerializableLikeExtension : AbstractParcelBoxTest() {
|
class ParcelBoxTestWithSerializableLikeExtension : AbstractParcelBoxTest() {
|
||||||
|
|||||||
+38
@@ -0,0 +1,38 @@
|
|||||||
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
@file:JvmName("TestKt")
|
||||||
|
package test
|
||||||
|
|
||||||
|
import kotlinx.android.parcel.*
|
||||||
|
import android.os.Parcel
|
||||||
|
import android.os.Parcelable
|
||||||
|
import java.util.Arrays
|
||||||
|
|
||||||
|
@Parcelize
|
||||||
|
data class Film(val genres: Array<Int>) : Parcelable {
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (javaClass != other?.javaClass) return false
|
||||||
|
|
||||||
|
other as Film
|
||||||
|
|
||||||
|
if (!Arrays.equals(genres, other.genres)) return false
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return Arrays.hashCode(genres)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box() = parcelTest { parcel ->
|
||||||
|
val film = Film(arrayOf(3, 5, 7))
|
||||||
|
film.writeToParcel(parcel, 0)
|
||||||
|
|
||||||
|
val bytes = parcel.marshall()
|
||||||
|
parcel.unmarshall(bytes, 0, bytes.size)
|
||||||
|
|
||||||
|
val film2 = readFromParcel<Film>(parcel)
|
||||||
|
assert(film == film2)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user