From da2b3d83139fbe526506ebe5c3a7b6209b36ba8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= Date: Fri, 26 Mar 2010 14:25:43 +0100 Subject: [PATCH] AndrolibResources: using ExtFile to get contents of apk file. --- src/brut/androlib/res/AndrolibResources.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/brut/androlib/res/AndrolibResources.java b/src/brut/androlib/res/AndrolibResources.java index 5fd23502..3ab61b0f 100644 --- a/src/brut/androlib/res/AndrolibResources.java +++ b/src/brut/androlib/res/AndrolibResources.java @@ -22,6 +22,7 @@ import brut.androlib.res.data.*; import brut.androlib.res.data.value.ResFileValue; import brut.androlib.res.data.value.ResXmlSerializable; import brut.androlib.res.decoder.*; +import brut.androlib.res.util.ExtFile; import brut.androlib.res.util.ExtMXSerializer; import brut.common.BrutException; import brut.directory.*; @@ -34,9 +35,9 @@ import org.xmlpull.v1.XmlSerializer; * @author Ryszard Wiśniewski */ final public class AndrolibResources { - public ResTable getResTable(File apkFile) throws AndrolibException { + public ResTable getResTable(ExtFile apkFile) throws AndrolibException { ResTable resTable = new ResTable(); - decodeArsc(resTable, getAndroidResourcesFile(), false); + decodeArsc(resTable, new ExtFile(getAndroidResourcesFile()), false); decodeArsc(resTable, apkFile, true); return resTable; } @@ -206,10 +207,10 @@ final public class AndrolibResources { } } - private void decodeArsc(ResTable resTable, File apkFile, boolean main) + private void decodeArsc(ResTable resTable, ExtFile apkFile, boolean main) throws AndrolibException { try { - loadArsc(resTable, new ZipRODirectory(apkFile) + loadArsc(resTable, apkFile.getDirectory() .getFileInput("resources.arsc"), main); } catch (DirectoryException ex) { throw new AndrolibException(