Commit Graph

990 Commits

Author SHA1 Message Date
oSumAtrIX
61bcd855dd
Merge branch 'upstream' 2023-08-19 02:02:00 +02:00
Connor Tumbleson
fedc754a78
refactor: remove unneeded blocks/semicolons (#3273) 2023-08-17 07:35:23 -04:00
Connor Tumbleson
225c9089d9
refactor: remove deprecations from test suite (#3269) 2023-08-13 14:25:32 -04:00
Connor Tumbleson
e99ed1ccbb
refactor: remove unused decodeManifest function (#3268) 2023-08-13 14:07:45 -04:00
Connor Tumbleson
fb6cd883c0
refactor: split out string block vs res table string (#3267) 2023-08-13 13:46:47 -04:00
oSumAtrIX
adc9452f66
feat: create missing directories 2023-08-12 01:59:12 +02:00
oSumAtrIX
72ffcbbc44
feat: decode 9patch files on Android 2023-08-11 00:56:49 +02:00
oSumAtrIX
4608df636e
feat: allow using the default XML serializer by ResourcesDecoder manually 2023-08-11 00:53:43 +02:00
oSumAtrIX
c0900e50c5
feat: allow instantiating with existing ApkInfo 2023-08-11 00:51:30 +02:00
oSumAtrIX
019b2e648d
feat: allow recording uncompressed files manually 2023-08-11 00:51:05 +02:00
oSumAtrIX
ad7520357f
fix: do not try to get existing AAPT binary if a path to it is provided 2023-08-11 00:50:32 +02:00
Connor Tumbleson
1243dd5546
Refactor logging for chunks and sparse flags. (#3260)
* refactor: log each chunk in verbose mode

* refactor: drop unneeded ":" from log output

* refactor: spit out sparse message once
2023-08-09 08:38:34 -04:00
Connor Tumbleson
0e226928ce
Remove Apktool Dummys. (#3258)
* refactor: properly parse dummy resources

* feat: remove dummys
2023-08-09 06:15:57 -04:00
Connor Tumbleson
bb9519a2d0
refactor: change naming pattern of class variables in StringBlock (#3256) 2023-08-08 07:11:11 -04:00
Connor Tumbleson
22d792e328
fix: support encode styled string if length larger than offset (#3254) 2023-08-07 19:52:34 -04:00
Connor Tumbleson
50226e50c1
fix: support decoding application with duplicate res entries (#3252) 2023-08-05 12:21:42 -04:00
Connor Tumbleson
342ff67a4c
Migrate to Gradle Kotlin DSL (#3249)
* feat: initial migration to kotlin

* feat: initial migration to kotlin

* fix: wire up dependencies

* fix: Deprecated tag for kotlin detection

* refactor: put all modules into sub-projects

* fix: include jar file (android framework)

* fix: add version message/info

* fix: wire up version/gitrev to properties

* fix: wire up proguard on cli

* fix: wire up proguard

* fix: wire up output cleaning command

* fix: drop license header on gradle files

 - fully rewritten from scratch by myself
 - no longer including license header on build files

* fix: add compile utf8/flags for java8

* refactor: remove unneeded curly braces

* feat: progress towards maven-publish

* build: publish to maven

* docs: update documentation

* refactor: prevent implicit order by removal of afterEvaluate

* build: remove unused license plugin
2023-08-05 06:28:31 -04:00
sv99
0a354a9d97
Merge ResAttrDecoder into the AXmlResourceParser (#3243) 2023-08-01 18:43:15 -04:00
sv99
9d7d58016e
ApkDecoder use apkFile and unknownFiles from ApkInfo (#3242) 2023-08-01 06:57:22 -04:00
Connor Tumbleson
7c2cb5b30a
Hardened String Block Parser (#3239)
* fix: add headerSize to stringBlock to detect larger headers

* fix: handle app with style offset, but 0 styles

* refactor: split counting stream into CountingDataInput

* fix: read strings till end of string pool chunk

* fix: support out of bound string reading

* fix: don't read string/style offset out of bounds

* refactor: cleanup comments for string parser

* style: comment on 4 byte alignment

* fix: only warn if utf16 string
2023-08-01 06:23:14 -04:00
Connor Tumbleson
663088890b
fix: skip unknown chunks in AXML (#3237) 2023-07-30 16:20:07 -04:00
Connor Tumbleson
445da0e658
Move to XMLUnit Legacy (#3235)
* build: migrate to xmlunit 2.9.1

* feat: opt into xxe protection for test suite
2023-07-30 13:48:26 -04:00
Connor Tumbleson
e19c44b1b1
refactor: drop unused method 2023-07-30 13:16:34 -04:00
Connor Tumbleson
cd275ff48b
fix: resolve missing namespace on system resources (#3234)
* fix: resolve missing namespace on system resources

* refactor: align pkdId check to 2nd of if
2023-07-30 07:18:06 -04:00
Connor Tumbleson
57ef8a205a
fix: support duplicated namespaces (#3233) 2023-07-30 05:52:35 -04:00
Igor Eisberg
33ca2929c9
refactor: clean up style and redundancy (#3232)
* refactor: clean up redundancy

* refactor: no need for both setApkFile and setApkFileName
2023-07-29 18:56:27 -04:00
Connor Tumbleson
ce180dce87
fix: un-deprecate --copy-original
-- fixes: #2129
2023-07-29 06:51:29 -04:00
Connor Tumbleson
486fb20084
Support empty resource table. (#3230)
* test: assertions for empty arsc table

* fix: don't crash if no pkgs found
2023-07-29 06:49:13 -04:00
Connor Tumbleson
fe93fd21d1
refactor: manual YAML Cleanup (#3229)
* refactor: add missing license headers

* fix: remove unused exceptions

* refactor: remove unused single quote / slash param
2023-07-29 06:14:40 -04:00
sv99
62b9eedb9e
Remove SnakeYAML for manual YAML Parser (#3191)
* Simple straitforward yaml serialization with minimal needed functionality

* Consolidate ApkInfo tests in the package brut.androlib.apk, unify interface YamlReader and add ApkInfoSerializationTest read -> write -> read test

* remove dependencies from snakeyaml

* remove unused methods

* correct indent test value

* correct style with curly braces

* add test item with hieroglyph
2023-07-29 05:59:15 -04:00
Connor Tumbleson
772646f95b
fix: end parsing if EOF is hit (#3223) 2023-07-26 07:27:15 -04:00
Connor Tumbleson
ab7998439e
"--no-compile-sdk-metadata" tests. (#3220)
* refactor: move loadDocument() to base

* test: confirm manifest properties are removed/left-alone

* chore: remove unused imports
2023-07-25 07:29:53 -04:00
Connor Tumbleson
7f0d94ede9
feat: Introduce --no-compile-sdk-metadata (#3208)
* feat: ignore sdk metadata during aapt2

* test: adjust test suite for aapt2 change
2023-07-25 06:43:15 -04:00
sv99
7a4a20ba34
Support explicit operation for when to load full resource table (#3217) 2023-07-25 06:18:13 -04:00
sv99
c2ddeac3ab
Explicit ResFileDecoder initiazation and add constructors AXmlResourceParser(ResTable resTable) and AndroidManifestResourceParser(ResTable resTable) (#3211) 2023-07-24 06:43:56 -04:00
Connor Tumbleson
490b6f8aee
fix: handle larger axml namespace headers than known (#3210) 2023-07-24 06:23:25 -04:00
Connor Tumbleson
03c198c1e4
fix: support skipping entries with NO_ENTRY (-1) flag (#3209) 2023-07-24 06:06:45 -04:00
Connor Tumbleson
79f57b070c
fix: support skipping unread header sizes of ResChunk (#3180)
* fix: support skipping unread header sizes of ResChunk

* refactor: note that header skip happens too late on some

* refactor: check for chunk header end at each of each header

* chore: skip reading header on string pools

* fix: move header check prior to reading entries on tables
2023-07-23 18:14:53 -04:00
Connor Tumbleson
c7bb163834
chore: fix typo on resource message, drop shorthand if logic 2023-07-23 17:39:47 -04:00
sv99
3ba9838d08
Sreamline decoding AndroidManifest.xml (#3171) 2023-07-23 17:37:55 -04:00
Connor Tumbleson
d1a0c941ab
Fix LocaleNumberSystem + ConfigFlag reading (#3205)
* fix: prevent over-reading config flags

* fix: properly read localeNumberingSystem

* test: adjust test for bcp47 aapt2 test

* fix: properly add 8 to 'read' on parser

* test: add test for aapt2 bcp47 tag

* test: add additional bcp47 test

* fix: handle numbering system parsing

* fix: add comment about localeNumber usage
2023-07-23 17:25:25 -04:00
Connor Tumbleson
54836509ed
fix: correct detection of sparse/not-sparse applications (#3201)
* test: add failing/passing sparse/not-sparse test

* fix: replace sparse/not applications w/ official sample

 -ref: c8f71aa67e

* fix: properly detect sparse applications during disassembly

* refactor: remove check on bool set for sparse resources
2023-07-23 11:20:12 -04:00
Igor Eisberg
24b0c3249d
fix: crash when decompiling framework-res.apk with a tag (regression) (#3193) 2023-07-22 09:21:19 -04:00
Igor Eisberg
79b2173b85
style: normalize command descs and redundancy (#3188) 2023-07-21 06:08:30 -04:00
Connor Tumbleson
d4ec44de41
Prevent loading from resource pool if type is not a resolveable resource (#3187)
* perf: prefer the shifted resId vs expensive package calls

* fix: only lookup values if reference/value
2023-07-20 21:32:19 -04:00
Igor Eisberg
261003316e
fix: add missing hasResources check (#3182) 2023-07-20 11:40:16 -04:00
sv99
e3e2a7e1d6
Allows run app from gradle for debugging purposes (#3179)
Co-authored-by: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
2023-07-20 06:03:47 -04:00
Connor Tumbleson
ca07a0a56c
Fix regressions towards apktool.yml generation (#3172)
* fix: prevent blowing out minSdkVersion

* fix: correct naming regression with apk name and sdk info

* chore: comment for why we double up minSdkVersion

* fix: deprecate compressionType

* test: assert apktool format isn't regressed
2023-07-20 05:37:46 -04:00
Connor Tumbleson
1493d9d357
fix: opt out of stricter java rules for zip64 and dot entries (#3178)
* fix: opt out of stricter java rules for zip64 and dot entries

* test: assert specific system properties for test suite
2023-07-20 05:01:21 -04:00
Connor Tumbleson
ba2f1283ed
fix: update links for apktool/baksmali/smali on usage 2023-07-17 06:55:08 -04:00