Skip to content
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.

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

Correct regressions towards apktool.yml generation #3172

Merged
merged 6 commits into from
Jul 20, 2023
Merged

Conversation

iBotPeaches
Copy link
Owner

@iBotPeaches iBotPeaches commented Jul 19, 2023

fixes: #3169

  • mApkFileName should return to apkFileName
  • mSdkInfo should return to sdkInfo
  • resourcesAreCompressed was what compressionType, fall back for the old
  • sdkInfo.* missing is because minSdkVersion will overwrite all

@iBotPeaches
Copy link
Owner Author

iBotPeaches commented Jul 19, 2023

compressionType is just hard-coded to false. It appears that broke between 2.0.0 and 2.1.0 when we removed the Zip64 stuff, which meant we no longer parsed the resources.arsc to check for stored/deflate.

So not sure if I should bring that back or just keep status quo for keep it as false.

Regression occurred back here for compressionType: v2.0.1...v2.0.2

@iBotPeaches
Copy link
Owner Author

@sv99 - May you peek this? Trying to undo some regressions and trying to research compressionType and hoping you can confirm/deny my research

@sv99
Copy link
Contributor

sv99 commented Jul 19, 2023

compressionType is just hard-coded to false. It appears that broke between 2.0.0 and 2.1.0 when we removed the Zip64 stuff, which meant we no longer parsed the resources.arsc to check for stored/deflate.

So not sure if I should bring that back or just keep status quo for keep it as false.

Regression occurred back here for compressionType: v2.0.1...v2.0.2

In the master branch decode - build for this apk worked without exception.

I have not found an opportunity to make a synonym for the field in the snakeyaml.
I think we may make custom serializer to yaml without using any library - structure very simple.

@iBotPeaches
Copy link
Owner Author

In the master branch decode - build for this apk worked without exception.

Yeah its tough to notice since a newly decoded application would generate a apktool.yml that the build understood. Probably more noticable for these various tools that swap versions or rebuild versions from previously decoded files. I don't think there is a bug with build - just a regression of the property names.

I have not found an opportunity to make a synonym for the field in the snakeyaml. I think we may make custom serializer to yaml without using any library - structure very simple.

Not sure I follow - I was going to try and prefer resourcesAreCompressed if its set and fall back to compressionType if its not found. However, the typing of the properties probably makes that difficult since neither would be nullable.

@iBotPeaches
Copy link
Owner Author

Not going to make any changes at the moment for the compression ones. They've been broken for years, but I'll add it back even though its false 100% of the time.

@iBotPeaches iBotPeaches marked this pull request as ready for review July 20, 2023 09:24
@iBotPeaches iBotPeaches enabled auto-merge (squash) July 20, 2023 09:37
@iBotPeaches iBotPeaches disabled auto-merge July 20, 2023 09:37
@iBotPeaches iBotPeaches merged commit ca07a0a into master Jul 20, 2023
@iBotPeaches iBotPeaches deleted the issue-3169 branch July 20, 2023 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Exception in thread "main" while parsing a block mapping
2 participants