Skip to content

safeparcel: Support short #2019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mar-v-in merged 1 commit into from
Aug 29, 2023
Merged

safeparcel: Support short #2019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion play-services-basement/src/main/java/org/microg/safeparcel/SafeParcelReflectionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ private static void writeField(AutoSafeParcelable object, Parcel parcel, int fla
case Long:
SafeParcelWriter.write(parcel, descriptor.id, (Long) descriptor.field.get(object));
break;
case Short:
SafeParcelWriter.write(parcel, descriptor.id, (Short) descriptor.field.get(object));
break;
case Boolean:
SafeParcelWriter.write(parcel, descriptor.id, (Boolean) descriptor.field.get(object));
break;
Expand Down Expand Up @@ -364,6 +367,14 @@ private static void readField(AutoSafeParcelable object, Parcel parcel, int head
descriptor.field.set(object, l);
break;
}
case Short: {
short i = SafeParcelReader.readShort(parcel, header);
if (descriptor.versionCode != -1 && i > descriptor.versionCode) {
Log.d(TAG, String.format("Version code of %s (%d) is older than object read (%d).", descriptor.field.getDeclaringClass().getName(), descriptor.versionCode, i));
}
descriptor.field.set(object, i);
break;
}
case Boolean:
descriptor.field.set(object, SafeParcelReader.readBool(parcel, header));
break;
Expand All @@ -388,7 +399,7 @@ private enum SafeParcelType {
Parcelable, Binder, Interface, Bundle,
StringList, IntegerList, BooleanList, LongList, FloatList, DoubleList, List, Map,
ParcelableArray, StringArray, ByteArray, ByteArrayArray, FloatArray, IntArray,
Integer, Long, Boolean, Float, Double, String, Byte;
Integer, Long, Short, Boolean, Float, Double, String, Byte;
}

public static class ClassDescriptor<T> {
Expand Down Expand Up @@ -506,6 +517,8 @@ private SafeParcelType getType() {
return SafeParcelType.Map;
if (clazz == int.class || clazz == Integer.class)
return SafeParcelType.Integer;
if (clazz == short.class || clazz == Short.class)
return SafeParcelType.Short;
if (clazz == boolean.class || clazz == Boolean.class)
return SafeParcelType.Boolean;
if (clazz == long.class || clazz == Long.class)
Expand Down