Commit Graph

567 Commits

Author SHA1 Message Date
Connor Tumbleson
6bb73b509d fix: throw specific errors during XMLPullParser error 2019-01-09 17:10:56 -05:00
Connor Tumbleson
ac3518e098 feat: add new exception types 2019-01-09 17:10:21 -05:00
Sebastian Rasmussen
b01dce7f3a Adapt AXMLResourceParser to handle broken headers.
Fixes #1976.
2019-01-08 21:20:50 +01:00
Connor Tumbleson
7cd8946849 fix: fallback to raw decoder if xml decoder failed
- prevents injection of false value
2019-01-04 18:00:19 -05:00
Connor Tumbleson
ec0d58fbad feat: add 32/64bit binaries for aapt1/aapt2 2019-01-04 11:24:28 -05:00
Connor Tumbleson
f997e0aff1 fix: patch out bools on ResBooleans, as they must be empty
- refs: #1918
2019-01-03 16:57:23 -05:00
Connor Tumbleson
127192e07d build: add new patched aapt1 version for mac 2018-12-18 18:19:24 -05:00
Connor Tumbleson
b0a7e64615 refactor: flatten directory structure of aapt binaries by 1 directory 2018-12-18 17:36:34 -05:00
Connor Tumbleson
e82537e340 Merge branch 'no-crunch-aapt-option' of https://github.com/Novex/Apktool 2018-12-18 16:24:27 -05:00
a-bahmani
db553ebe8d
Fix null pointer
When I am decompiling an apk, I got this exception:
Exception in thread "main" java.lang.NullPointerException
        at brut.androlib.res.data.ResResSpec.<init>(ResResSpec.java:42)
2018-12-17 23:42:28 +03:30
Connor Tumbleson
83f5b21574
fix: use striped symbols build of aapt.exe 2018-09-05 19:31:07 -04:00
Connor Tumbleson
e752ebf8ff
build: update aapt1/2 builds for darwin 2018-09-02 10:01:33 -04:00
Connor Tumbleson
da133f482f
build: add aapt2 for win/unix 2018-09-02 09:55:36 -04:00
Connor Tumbleson
846d6a783a
build: add win/unix aapt1 builds
- refs: https://github.com/iBotPeaches/platform_frameworks_base/commits/apktool_9.0.0
2018-09-02 09:37:37 -04:00
Connor Tumbleson
3f85dfa6c9 fix: revert change that enforced "STRINGPOOL_TYPE" on StringPool
- fixes: #1876
2018-08-23 17:14:38 -04:00
Connor Tumbleson
aa0047c76c
feat: update internal freamwork to API 28 (Android Pie Final) 2018-08-07 20:52:44 -04:00
Seb Patane
b0fd764df4 feat: Expose the aapt --no-crunch option
- Add a --no-crunch/-nc flag to apktool which gets passed through to aapt
- This allows apktool to make a byte-for-byte copy of resource files
- refs: #1232
2018-07-24 13:54:37 +10:00
Alexei Khlebnikov
564b285126 fix: add file extension to doNotCompress only if the file size is not 0 2018-07-19 18:14:48 +02:00
Connor Tumbleson
985f8bb42f
feat: add new win/unix aapt2 build 2018-06-17 08:45:25 -04:00
Connor Tumbleson
925c6c0481 feat: add new mac os x aapt2 build 2018-06-14 16:36:19 -04:00
Connor Tumbleson
016fc51491
fix: add new win/unix aapt2 binaries 2018-06-12 07:10:51 -04:00
Connor Tumbleson
5eee6d2e48 fix: update aapt2 mac binary for new aosp build 2018-06-11 15:10:57 -04:00
Connor Tumbleson
5c79f4228b fix: revert the new aapt1 build. aapt1 builds are frozen 2018-05-11 13:31:08 -04:00
Connor Tumbleson
e6788f2cb4 fix: add new aapt1/aapt2 mac os x binaries 2018-05-03 15:46:05 -04:00
Connor Tumbleson
061ddb8ee6 fix: remove hardcoded list of no-compressed assets
- We no longer use aapt for building assets, so this code is never ran
 in aapt1/2. So we can no longer skip these assets.
2018-04-12 11:45:29 -04:00
Connor Tumbleson
6554881606 Revert "options: deprecate "doNotCompress", introduce "noCompressAssets""
This reverts commit cb6b6dfda8.
2018-04-06 14:59:10 -04:00
Connor Tumbleson
d755724ed8 Revert "decode: only store full relative path to uncompressed assets"
This reverts commit bd9c9c7cec.
2018-04-06 14:59:03 -04:00
Connor Tumbleson
4d89228686 Revert "decode: store uncompressed assets to new property"
This reverts commit 14eedde165.
2018-04-06 14:58:42 -04:00
Connor Tumbleson
0700c684b6 Revert "build: introduce "buildUnknownAndUncompressedAssets""
This reverts commit e35f66b0e0.
2018-04-06 14:58:35 -04:00
Connor Tumbleson
72196f3544 Revert "fix: normalize paths for uncompressed assets & unknown files"
This reverts commit ca25a26944.
2018-04-06 14:58:11 -04:00
Connor Tumbleson
46ebcb0fab Revert "fix: don't use deprecated property "doNotCompress""
This reverts commit 258fb82fe2.
2018-04-06 14:57:24 -04:00
Connor Tumbleson
bb42ef068e Revert "fix: Applications with implicit sdk versioning lose that information"
This reverts commit 25a164dd10.
2018-04-06 14:57:09 -04:00
Connor Tumbleson
db59f93e36 fix: ignore package "FFFFFFFFFFFFFFFFFFFFFF" to prevent wrong renaming
- refs: #1752 / #1471
2018-04-06 14:46:39 -04:00
Connor Tumbleson
041659c43f style: output "built apk" when task is completed 2018-04-06 14:03:42 -04:00
Connor Tumbleson
25a164dd10 fix: Applications with implicit sdk versioning lose that information
- This is a temporary hack to keep application building, but will not
 work due to missing nearly all resources.
 - refs: #1761
2018-04-06 14:02:41 -04:00
Connor Tumbleson
2d190d019c fix: remove 6 year old experimental smali resource tagger
- refs: #244
 - Regular expressions are not the way to fix this. Too many situations
 in smali where patterns won't work. Correct fix would be to hook dexlib
2018-04-06 12:03:08 -04:00
Connor Tumbleson
258fb82fe2 fix: don't use deprecated property "doNotCompress" 2018-04-06 10:49:08 -04:00
Connor Tumbleson
ca25a26944 fix: normalize paths for uncompressed assets & unknown files 2018-04-06 10:31:28 -04:00
Connor Tumbleson
e35f66b0e0 build: introduce "buildUnknownAndUncompressedAssets"
- processes assets that are stored (uncompressed)
 - additionally process unknown files
 - modifies application after build process
 - prevents "too long" execution command
 - fixes #1272
2018-04-05 17:07:55 -04:00
Connor Tumbleson
14eedde165 decode: store uncompressed assets to new property 2018-04-05 17:07:55 -04:00
Connor Tumbleson
bd9c9c7cec decode: only store full relative path to uncompressed assets 2018-04-05 17:07:55 -04:00
Connor Tumbleson
cb6b6dfda8 options: deprecate "doNotCompress", introduce "noCompressAssets" 2018-04-05 17:07:55 -04:00
Connor Tumbleson
c7ac2c05e2
update internal framework to API P (Android P Preview - x.x)
- refs: #1742
2018-03-13 11:05:15 -04:00
Connor Tumbleson
7621fdb79c Assume Android P will be API 28
- refs: #1742
2018-03-12 15:34:32 -04:00
Connor Tumbleson
3f8d9fa835 aapt2: patch system for decoding pkgId between 0x7f - 0xff 2018-03-05 10:28:50 -05:00
Connor Tumbleson
448d14592f aapt2: don't rebuild compile stage unless needed 2018-02-28 18:40:13 -05:00
Connor Tumbleson
d2c808dd7d aapt2: refactor loading of aapt/aapt2 binaries
- change: die out if invalid aapt path is provided
2018-02-28 11:25:56 -05:00
Connor Tumbleson
f05bd31e59 aapt2: sparse resource pulling from yaml 2018-02-28 11:05:07 -05:00
Connor Tumbleson
3c84590a1a aapt2: treat verbose output as fine 2018-02-28 10:58:38 -05:00
Connor Tumbleson
6f45869068 aapt2: update binaries
- refs: 595581e599
2018-02-22 11:22:41 -05:00
Connor Tumbleson
200ad0250b aapt2: add linux/windows binaries
- very buggy
2018-02-22 11:22:40 -05:00
Connor Tumbleson
5d95b388aa aapt2: beginning use of aapt2 vs aapt1 params 2018-02-22 11:22:40 -05:00
Connor Tumbleson
5a8bc45653 aapt2: aapt2 is a staged build (compile and link).
- we destroy the "compile" stage item after a link, but keep the pending directory
 - apktool then cannot complete link stage
 - if aapt2 is used, lie to system and re-process
 - todo: rethink this
2018-02-22 11:22:40 -05:00
Connor Tumbleson
a8bdad628a aapt2: wire up zipPackage() instead of using aapt1 for final apk package 2018-02-22 11:22:40 -05:00
Connor Tumbleson
f5caccbc2e aapt2: flag for aapt2 and sparse resources to meta-info/apkOptions 2018-02-22 11:22:40 -05:00
Connor Tumbleson
0827b2b7a2 aapt2: read the type spec and infer if sparsely packed 2018-02-22 11:22:40 -05:00
Connor Tumbleson
88987e60b3 aapt2: Add a flag to determine if sparse resources or not 2018-02-22 11:22:40 -05:00
Connor Tumbleson
ac1402aa7e aapt2: binary install for mac 2018-02-22 11:22:40 -05:00
Connor Tumbleson
34a2d03b31
Support for applications with an empty resources.arsc file
- fixes #1730
2018-02-19 06:45:48 -05:00
Connor Tumbleson
b7b449eaaf
We are ignoring typeIdOffset
- missing sample that experiences this
 - needs tests
 - samples requested: https://github.com/iBotPeaches/Apktool/issues/1728
 - refs: f90f2f8dc3
2018-02-16 08:38:07 -05:00
Connor Tumbleson
9fc1ede991
License 2018 update 2018-02-16 08:26:53 -05:00
Connor Tumbleson
1d485d21e9
cleanup formatting in smali-res-tagger
- experiment rewriting resIds in smali to remove need of public.xml
2018-02-16 08:25:34 -05:00
Connor Tumbleson
65fb5c25c2
Revert "switch to "startsWith" to stop AndroResGuard tricks"
This reverts commit c7f4dfe1db.
2018-02-13 08:47:43 -05:00
Connor Tumbleson
085e8f66ef
Switch to loop for checking extensions we are treating as raw
- 9patch (samsung)
 - regular (apple)
 - I imagine this list will grow over time
2018-02-13 08:47:02 -05:00
Connor Tumbleson
c7f4dfe1db
switch to "startsWith" to stop AndroResGuard tricks 2018-02-13 08:46:52 -05:00
Connor Tumbleson
e7d511adf8 Remove unused line
- refs: no issue
2018-02-08 15:17:51 -05:00
Connor Tumbleson
d1857102dd Add spaces where missing to make logic easier to read
- refs: no issue
2018-02-08 15:14:19 -05:00
Connor Tumbleson
bca474272e Support for rebuilding root depth kotlin folder
- refs: #1703
2018-02-07 09:42:56 -05:00
Connor Tumbleson
7d22fc66b5 Initial testing of private namespace
- added sample (removed attribute names)
2017-12-14 10:55:35 -05:00
Connor Tumbleson
b525f235f8 code style cleanup 2017-12-08 16:38:31 -05:00
Connor Tumbleson
a0cd772205 Remove duplicate manifest-only parameter 2017-12-08 16:31:25 -05:00
Nic Allen
88eed24625 Patch APKTool to allow repeated entry offsets to appear 2017-12-07 15:38:25 -08:00
Ruben Anagua
dd81dbfc9c Add ability to force decoding of manifest 2017-12-07 11:33:04 +00:00
Connor Tumbleson
2b9728e9f3 Prevent ugly "Content is not allowed in prolog" warning
- fixes: #1634
2017-12-01 15:21:47 -05:00
Connor Tumbleson
3264f142cb
Remove useless null warning 2017-11-29 07:56:24 -05:00
Connor Tumbleson
ef9be883cd update internal framework to API 27 (Android Oreo - 8.1)
- fixes #1667
2017-11-23 08:37:08 -05:00
Matt Insko
5e1a47a827 Treat fonts as raw data, fixes #1662 2017-11-16 09:35:16 -05:00
Connor Tumbleson
c23c1303dd Merge branch 'master' into issue-1639 2017-10-24 15:39:28 -04:00
Connor Tumbleson
0271e55370
Fix regression when --frame-path points to non existing directory
- fixes #1639
2017-10-14 12:36:54 -04:00
Connor Tumbleson
41018a81b8
Remove .exit() falls from library code
- fixes #1640
2017-10-14 12:36:07 -04:00
Connor Tumbleson
3ec4f360ab
Add support for shorthand SDK for bounding check
- fixes #1630
2017-09-28 08:23:02 -04:00
Connor Tumbleson
bc00cce9bd Add support for 4 non-positional attributes
- adds tests
 - fixes #1611
2017-09-19 17:02:42 -04:00
Connor Tumbleson
f0f87c844e Adds ability to skip asset files
- fixes #1605
 - prevents rebuild
2017-09-19 15:51:04 -04:00
Connor Tumbleson
dc33533d76 add tests, make public method 2017-09-19 15:09:25 -04:00
Connor Tumbleson
21e9dd514c cs cleanup 2017-09-19 14:42:14 -04:00
Jan Vidar Krey
5f0d53ba20 Support bounding targetSdkVersion between minSdkVersion and maxSdkVersion
It is possible to create a an AndroidStudio project that uses the following
nonsense settings:

    defaultConfig {
        minSdkVersion 15
        maxSdkVersion 19
        targetSdkVersion 25
    }

The application is successfully built by Android Studio, and the APK
works when installed on the relevant devices, however the app cannot
be re-built with Apktool afterwards.

This patch works around the problem by explicitly setting the
targetSdkVersion to the max of the maxSdkVersion and min of the minSdkVersion
only if these are specified.
2017-09-15 16:24:39 +02:00
Connor Tumbleson
1c33fba646
close reader as well if syntax error 2017-08-27 09:57:32 -04:00
Connor Tumbleson
d6e676c583
Merge branch 'patch-1' of https://github.com/footpatch/Apktool into footpatch-patch-1 2017-08-27 09:56:39 -04:00
Connor Tumbleson
78a80d14b0 Merge pull request #1601 from xpirt/master
fix potential class cast exceptions
2017-08-27 09:55:13 -04:00
Connor Tumbleson
e9618fae6b
Windows binary is still 32 bit 2017-08-27 09:54:36 -04:00
Andrei Conache
9abaa4ee30 fix potential class cast exceptions
- fixes #1444
2017-08-27 15:23:08 +02:00
footpatch
1fddb05b71 Close input stream in SmaliMod.java 2017-08-25 20:47:31 +02:00
Connor Tumbleson
ff8245af97
update internal framework to API 26 (Android Oreo) 2017-08-24 22:54:42 -04:00
Connor Tumbleson
fa966d2d66 Drop 32 bit binaries
- update unix/win/mac 64 bit binaries
 - fixes #1598
 - refs #1594
2017-08-24 15:53:52 -04:00
Connor Tumbleson
91ef166ffb
unix aapt binaries - apktool-8.0.0_r4 2017-08-24 06:31:04 -04:00
Connor Tumbleson
c818dc85f0 mac aapt binaries - apktool-8.0.0_r4 2017-08-23 17:04:11 -04:00
Connor Tumbleson
0f4cfcb892 Tweak colorimetry to colorMode 2017-08-23 17:03:51 -04:00
Connor Tumbleson
68a7eb7a74 example applications (sparse & not) tests
- update ARSCDecoder to detail sparse applications
2017-08-23 14:43:57 -04:00
Connor Tumbleson
6473611d47 Initial work for Sparsed Resource Types
- die out if encountered
2017-08-23 14:14:48 -04:00
Connor Tumbleson
bf44f9b809 Support for Color HDR & Gamut 2017-08-23 13:53:30 -04:00