Skip to content

Refactor(android): Simplify protobuf field checks and fix resource lookup #536

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
chromy merged 1 commit into from
Jan 9, 2026
+6 −6
Merged

Refactor(android): Simplify protobuf field checks and fix resource lookup #536

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/launchpad/artifacts/android/manifest/proto_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ def _get_optional_attr_value(
return str(compiled_item.str.value)
elif compiled_item.HasField("ref"):
ref = compiled_item.ref
if ref.HasField("name"):
if ref.name:
return ProtoXmlUtils._get_resource_by_key_from_proto_resource_files(ref.name, proto_res_tables)
elif ref.HasField("id"):
elif ref.id:
return ProtoXmlUtils._get_resource_by_id_from_proto_resource_files(ref.id, proto_res_tables)
else:
logger.error("item.value.ref.id and item.value.ref.name are not defined")
Expand Down
4 changes: 2 additions & 2 deletions src/launchpad/artifacts/android/resources/proto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ def _get_default_value_from_entry(self, entry: Entry) -> str | None:
return str(item.str.value)
elif item.HasField("ref"):
ref = item.ref
if ref.name:
if ref.id:
return self.get_value_by_id(ref.id)
elif ref.id:
elif ref.name:
return self.get_value_by_key(ref.name)
else:
logger.debug("item.value.ref.id and item.value.ref.name are not defined.")
Expand Down
4 changes: 2 additions & 2 deletions src/launchpad/parsers/android/icon/proto_xml_drawable_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ def _convert_pb_attribute(self, pb_attr: PbXmlAttribute) -> XmlAttribute:
value = str(compiled_item.str.value)
elif compiled_item.HasField("ref"):
ref = compiled_item.ref
if ref.HasField("name"):
if ref.name:
value = ref.name
elif ref.HasField("id"):
elif ref.id:
value = f"resourceId:{ref.id:#010x}"
raw_type = 0x01 # TYPE_REFERENCE
elif compiled_item.HasField("prim"):
Expand Down
Loading