Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/gradle-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK 8
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: '8'
distribution: 'temurin'
- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v6
- name: Test and build jar
run: ./gradlew test jar
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: ARSCLib
path: build/libs
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.14.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,14 @@ private int convertValueToList(String value, String[] options, int defaultValue)

private int getAttributeIntValue(ResXmlAttribute xmlAttribute, int defaultValue) {
if(xmlAttribute != null) {
ValueType valueType = xmlAttribute.getValueType();
if(valueType != null && valueType.isReference()) {
return xmlAttribute.getData();
}
int type = xmlAttribute.getType() & 0xff;
if(type > 0x10 && type <= 0x1f) {
return xmlAttribute.getData();
}
// TODO: resolve if type is REFERENCE
}
return defaultValue;
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/com/reandroid/arsc/chunk/xml/ResXmlDocumentTest.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.reandroid.arsc.chunk.xml;

import android.content.res.XmlResourceParser;
import com.reandroid.apk.AndroidFrameworks;
import com.reandroid.apk.ApkModule;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.model.ResourceLibrary;
import com.reandroid.arsc.value.ValueType;
import com.reandroid.xml.XMLFactory;
import org.junit.Assert;
import org.junit.Test;
Expand Down Expand Up @@ -114,6 +116,22 @@ public void testRemoveAttribute(){
Assert.assertEquals("Attribute count", 0, root.getAttributeCount());
}
@Test
public void testAttributeIntValueForReference() throws IOException, XmlPullParserException {
ResXmlDocument document = new ResXmlDocument();
ResXmlElement manifest = document.getOrCreateElement("manifest");
ResXmlElement app = manifest.newElement("application");
ResXmlAttribute icon = app.getOrCreateAndroidAttribute("icon", 0x7f010123);
int resourceId = 0x7f010123;
icon.setTypeAndData(ValueType.REFERENCE, resourceId);

XmlResourceParser parser = app.getResourceParser();
Assert.assertEquals(XmlPullParser.START_TAG, parser.next());
Assert.assertEquals(resourceId, parser.getAttributeIntValue(
ResourceLibrary.URI_ANDROID,
"icon",
-1));
}
@Test
public void testEncodeDecodeXml() throws XmlPullParserException, IOException {
ResXmlDocument document = new ResXmlDocument();
document.setApkFile(createEmptyApkModule());
Expand Down