From 3f7dc3bf9f93ed17f7b55b41251c638dcb09b814 Mon Sep 17 00:00:00 2001
From: REAndroid <droid.github@gmail.com>
Date: Sat, 11 Feb 2023 14:03:18 -0500
Subject: [PATCH] fix: encode unknown hex reference id

---
 .../apk/xmlencoder/XMLValuesEncoderAttr.java   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderAttr.java b/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderAttr.java
index 20d6571..29f10c0 100644
--- a/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderAttr.java
+++ b/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderAttr.java
@@ -99,8 +99,12 @@ class XMLValuesEncoderAttr extends XMLValuesEncoderBag{
         for(int i=0;i<count;i++){
             XMLElement child=element.getChildAt(i);
 
-            int resourceId=materials.resolveLocalResourceId("id",
-                    child.getAttributeValue("name"));
+            String name = child.getAttributeValue("name");
+            int resourceId = decodeUnknownAttributeHex(name);
+            if(resourceId==0){
+                resourceId=materials.resolveLocalResourceId("id",
+                        name);
+            }
 
             ValueDecoder.EncodeResult encodeResult =
                     ValueDecoder.encodeHexOrInt(child.getTextContent());
@@ -128,4 +132,14 @@ class XMLValuesEncoderAttr extends XMLValuesEncoderBag{
         }
         return 0;
     }
+    private int decodeUnknownAttributeHex(String name){
+        if(name.length()==0||name.charAt(0)!='@'){
+            return 0;
+        }
+        name=name.substring(1);
+        if(!ValueDecoder.isHex(name)){
+            return 0;
+        }
+        return ValueDecoder.parseHex(name);
+    }
 }