From 80d9d6cf2ca1dfec435b0adc723bba8f8926c13b Mon Sep 17 00:00:00 2001 From: Abhi <85984486+AbhiTheModder@users.noreply.github.com> Date: Sat, 24 May 2025 06:04:27 +0530 Subject: [PATCH 1/2] fix inconsistent res path --- .../java/com/reandroid/apkeditor/refactor/AutoRefactor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java b/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java index d4c8dce4..083862d1 100644 --- a/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java +++ b/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java @@ -42,7 +42,9 @@ public int refactorFilePaths(){ int renameCount = 0; List resFileList = mApkModule.listResFiles(); for(ResFile resFile:resFileList){ - String path = RefactorUtil.RES_DIR + "/" + resFile.buildPath(); + String path = resFile.buildPath(); + path = path.startsWith(RefactorUtil.RES_DIR + "/") ? path + : RefactorUtil.RES_DIR + "/" + path; if(path.equals(resFile.getFilePath())){ continue; } From 428e2c08a2e7ef0d7baa4b2b531db14c67f8345f Mon Sep 17 00:00:00 2001 From: Abhi <85984486+AbhiTheModder@users.noreply.github.com> Date: Sat, 24 May 2025 17:47:29 +0000 Subject: [PATCH 2/2] chore: address review --- .../java/com/reandroid/apkeditor/refactor/AutoRefactor.java | 5 ++--- .../java/com/reandroid/apkeditor/refactor/RefactorUtil.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java b/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java index 083862d1..0e2cce0f 100644 --- a/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java +++ b/src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java @@ -19,6 +19,7 @@ import com.reandroid.apk.ApkModule; import com.reandroid.apk.ResFile; import com.reandroid.arsc.chunk.TableBlock; +import com.reandroid.arsc.chunk.PackageBlock; import com.reandroid.identifiers.PackageIdentifier; import com.reandroid.identifiers.TableIdentifier; import com.reandroid.identifiers.TypeIdentifier; @@ -42,9 +43,7 @@ public int refactorFilePaths(){ int renameCount = 0; List resFileList = mApkModule.listResFiles(); for(ResFile resFile:resFileList){ - String path = resFile.buildPath(); - path = path.startsWith(RefactorUtil.RES_DIR + "/") ? path - : RefactorUtil.RES_DIR + "/" + path; + String path = resFile.buildPath(PackageBlock.RES_DIRECTORY_NAME); if(path.equals(resFile.getFilePath())){ continue; } diff --git a/src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java b/src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java index a7f9b32c..76db0dcf 100644 --- a/src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java +++ b/src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java @@ -127,6 +127,4 @@ public static boolean isGoodName(String name){ } private static final Pattern PATTERN_GOOD_NAME =Pattern.compile("^[A-Za-z]{2,15}[_.A-Za-z0-9]*$"); private static final Pattern PATTERN_GENERATED_NAME=Pattern.compile("^.+_(0x[0-9a-f]{7,8})$"); - - public static final String RES_DIR="res"; }