fix rebuild apk without res directory when it use AndResGuard plugin #2943
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m/shwenzhang/AndResGuard plugin to guard resource. according to AndResGuard offical document, ex. "It changes res/drawable/wechat to r/d/a"
iBotPeaches
requested changes
Nov 20, 2022
Comment on lines
+129
to
+130
| LOGGER.info("Found illegal resources dir r,decode it!"); | ||
| apkResourcesFileNames.add("r"); |
There was a problem hiding this comment.
This messaging pattern does not follow our pattern we have.
| apkFile.getDirectory().copyToDir(outDir, APK_RESOURCES_FILENAMES); | ||
| Directory directory = apkFile.getDirectory(); | ||
| List<String> apkResourcesFileNames = new ArrayList<>(Arrays.asList(APK_RESOURCES_FILENAMES)); | ||
| if (directory.getDirs().containsKey("r")) { |
| try { | ||
| LOGGER.info("Copying raw resources..."); | ||
| apkFile.getDirectory().copyToDir(outDir, APK_RESOURCES_FILENAMES); | ||
| Directory directory = apkFile.getDirectory(); | ||
| List<String> apkResourcesFileNames = new ArrayList<>(Arrays.asList(APK_RESOURCES_FILENAMES)); |
There was a problem hiding this comment.
Couldn't we just load all the AndResGuard res directories into APK_RESOURCES_FILENAMES and ensure copyToDir handles null/missing directories?
|
Thanks for drawing my attention to this area. I've refactored it and added a test to prevent regression with raw handling w/ AndResGuard in here - #2944 So closing this one. |
iBotPeaches
added a commit
that referenced
this pull request
Nov 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix rebuild apk without res when the origin apk use https://github.co…m/shwenzhang/AndResGuard plugin to guard resource.
according to AndResGuard official document, ex. "It changes res/drawable/wechat to r/d/a"