Skip to content

Fix duplicate res/ directory in APK refactor output #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
REAndroid merged 2 commits into from
May 24, 2025
Merged

Fix duplicate res/ directory in APK refactor output #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80d9d6c
fix inconsistent res path
AbhiTheModder May 24, 2025
428e2c0
chore: address review
AbhiTheModder May 24, 2025
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
3 changes: 2 additions & 1 deletion src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,7 +43,7 @@ public int refactorFilePaths(){
int renameCount = 0;
List<ResFile> resFileList = mApkModule.listResFiles();
for(ResFile resFile:resFileList){
String path = RefactorUtil.RES_DIR + "/" + resFile.buildPath();
String path = resFile.buildPath(PackageBlock.RES_DIRECTORY_NAME);
if(path.equals(resFile.getFilePath())){
continue;
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}