azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parcelable: Use specialized write/create methods where available (KT-20057)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-09-06 23:57:45 +03:00
committed by Yan Zhulanow
parent f6d7a17227
commit 1b688182cd
5 changed files with 104 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt
+20 -2
View File
@@ -72,6 +72,12 @@ interface ParcelSerializer {
|| asmType.descriptor == "[F"
|| asmType.descriptor == "[L" -> PrimitiveArrayParcelSerializer(asmType)
asmType.descriptor == "[Landroid/os/IBinder;" -> NullCompliantObjectParcelSerializer(asmType,
Method("writeBinderArray"), Method("createBinderArray"))
asmType.descriptor == "[Ljava/lang/String;" -> NullCompliantObjectParcelSerializer(asmType,
Method("writeStringArray"), Method("createStringArray"))
asmType.sort == Type.ARRAY -> {
val elementType = type.builtIns.getArrayElementType(type)
val elementSerializer = get(elementType, typeMapper.mapTypeSafe(elementType), context, strict = strict())
@@ -101,8 +107,20 @@ interface ParcelSerializer {
|| className == TreeSet::class.java.canonicalName
-> {
val elementType = type.arguments.single().type
val elementSerializer = get(
elementType, typeMapper.mapTypeSafe(elementType), context, forceBoxed = true, strict = strict())
val elementAsmType = typeMapper.mapTypeSafe(elementType)
if (className == List::class.java.canonicalName) {
// Don't care if the element type is nullable cause both writeStrongBinder() and writeString() support null values
if (elementAsmType.descriptor == "Landroid/os/IBinder;") {
return NullCompliantObjectParcelSerializer(asmType,
Method("writeBinderList"), Method("createBinderArrayList", "()Ljava/util/ArrayList;"))
} else if (elementAsmType.descriptor == "Ljava/lang/String;") {
return NullCompliantObjectParcelSerializer(asmType,
Method("writeStringList"), Method("createStringArrayList", "()Ljava/util/ArrayList;"))
}
}
val elementSerializer = get(elementType, elementAsmType, context, forceBoxed = true, strict = strict())
wrapToNullAwareIfNeeded(type, ListSetParcelSerializer(asmType, elementSerializer))
}