fix. test fix of android sdk error.

Author: nikescar

apk/src/compiler/attributes.rs

@@ -15,7 +15,7 @@ pub fn compile_attr(table: &Table, name: &str, value: &str, strings: &Strings) -
             let id = table.entry_by_ref(Ref::parse(value)?)?.id();
             (u32::from(id), ResValueType::Reference)
         }
-        ResAttributeType::String => (strings.id(value) as u32, ResValueType::String),
+        ResAttributeType::String => (strings.id(value)? as u32, ResValueType::String),
         ResAttributeType::Integer => (value.parse()?, ResValueType::IntDec),
         ResAttributeType::Boolean => match value {
             "true" => (0xffff_ffff, ResValueType::IntBoolean),
@@ -107,11 +107,12 @@ pub struct Strings {
 }
 
 impl Strings {
-    pub fn id(&self, s2: &str) -> i32 {
-        self.strings
-            .iter()
-            .position(|s| s == s2)
-            .with_context(|| format!("all strings added to the string pool: {s2}"))
-            .unwrap() as i32
+    pub fn id(&self, s2: &str) -> Result<i32> {
+        match self.strings.iter().position(|s| s == s2) {
+            Some(pos) => Ok(pos as i32),
+            None => {
+                anyhow::bail!("String '{}' not found in string pool. Available strings: {:?}", s2, self.strings);
+            }
+        }
     }
 }

apk/src/compiler/xml.rs

@@ -20,8 +20,8 @@ pub fn compile_xml(xml: &str, table: &Table) -> Result<Chunk> {
         chunks.push(Chunk::XmlStartNamespace(
             ResXmlNodeHeader::default(),
             ResXmlNamespace {
-                prefix: ns.name().map(|ns| strings.id(ns)).unwrap_or(-1),
-                uri: strings.id(ns.uri()),
+                prefix: ns.name().map(|ns| strings.id(ns).unwrap_or(-1)).unwrap_or(-1),
+                uri: strings.id(ns.uri())?,
             },
         ));
     }
@@ -30,8 +30,8 @@ pub fn compile_xml(xml: &str, table: &Table) -> Result<Chunk> {
         chunks.push(Chunk::XmlEndNamespace(
             ResXmlNodeHeader::default(),
             ResXmlNamespace {
-                prefix: ns.name().map(|ns| strings.id(ns)).unwrap_or(-1),
-                uri: strings.id(ns.uri()),
+                prefix: ns.name().map(|ns| strings.id(ns).unwrap_or(-1)).unwrap_or(-1),
+                uri: strings.id(ns.uri())?,
             },
         ));
     }
@@ -107,7 +107,7 @@ fn compile_node(
                 size: 8,
                 res0: 0,
                 data_type: ResValueType::String as u8,
-                data: strings.id(attr.value()) as u32,
+                data: strings.id(attr.value())? as u32,
             }
         };
         let raw_value = if value.data_type == ResValueType::String as u8 {
@@ -116,8 +116,8 @@ fn compile_node(
             -1
         };
         let attr = ResXmlAttribute {
-            namespace: attr.namespace().map(|ns| strings.id(ns)).unwrap_or(-1),
-            name: strings.id(attr.name()),
+            namespace: attr.namespace().map(|ns| strings.id(ns).unwrap_or(-1)).unwrap_or(-1),
+            name: strings.id(attr.name())?,
             raw_value,
             typed_value: value,
         };
@@ -126,9 +126,9 @@ fn compile_node(
     let namespace = node
         .tag_name()
         .namespace()
-        .map(|ns| strings.id(ns))
+        .map(|ns| strings.id(ns).unwrap_or(-1))
         .unwrap_or(-1);
-    let name = strings.id(node.tag_name().name());
+    let name = strings.id(node.tag_name().name())?;
     chunks.push(Chunk::XmlStartElement(
         ResXmlNodeHeader::default(),
         ResXmlStartElement {
@@ -145,7 +145,7 @@ fn compile_node(
     ));
     /*let mut children = BTreeMap::new();
     for node in node.children() {
-        children.insert(strings.id(node.tag_name().name()), node);
+        children.insert(strings.id(node.tag_name().name())?, node);
     }
     for (_, node) in children {
         compile_node(node, strings, chunks)?;