Connor Tumbleson
646eb54102
aapt2: refactor testsuite
...
- split from aapt1/aapt2 (those that do building)
- tests that just test decode (no aapt) split
- categories for androlib/encdoers/util for various others
2018-02-28 15:11:39 -05:00
Connor Tumbleson
09148902ef
aapt2: start of tests for aapt2
2018-02-28 13:27: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
dc9d1866a5
test: rewrite test suite to use BaseTest extending
2018-02-22 11:22:41 -05:00
Connor Tumbleson
593b357ed1
support test for lib/libs folder
2018-02-22 11:22:41 -05:00
Connor Tumbleson
828ba8aef3
aapt2: kill off aapt1 testsuite, rebuild from scratch
2018-02-22 11:22:40 -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
9e5df69d17
aapt2: remove unneeded newline
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
f57c73d421
aapt2: copy "BuildAndDecodeTest" to aapt2 for temporary testing
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
895af9c975
refactor test
2017-12-14 14:07:32 -05:00
Connor Tumbleson
2838d292a0
new test apk
2017-12-14 10:55:35 -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
d46ba2fb82
add small test for #1157
2017-12-13 14:41:36 -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
Connor Tumbleson
23486830a9
Passing test for #1587
...
- fixes #1587
- refs: 0fa6418553
2017-12-07 17:10:30 -05:00
Connor Tumbleson
d414bbd3b4
add unit-tests for 1680
2017-12-07 16:38:38 -05: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
ee2b7206f1
Add test for #1674
2017-11-29 07:43:45 -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
Connor Tumbleson
0a3adab84c
Add test changes to detect encoding of raw font files
...
- refs #1662
2017-11-23 06:48:56 -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
Connor Tumbleson
4ba1a035ae
Merge branch 'master' of https://github.com/Promon/Apktool into Promon-master
2017-09-19 14:41:04 -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
a0ae7eaea8
Skip any file attempting to use relative paths
...
- fixes #1589
2017-09-03 18:12:57 -04: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
67b2325136
add font test
2017-08-24 22:49:43 -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
800394cf30
new qualifiers require v26 naming
2017-08-23 17:53:33 -04:00
Connor Tumbleson
adeffe3e98
Initial work at qualifier test suite changes
2017-08-23 17:04:26 -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
Connor Tumbleson
eee73b945d
Support for VRHeadset Qualifier
2017-08-23 13:05:08 -04:00
Connor Tumbleson
f886c7094d
Merge pull request #1590 from iBotPeaches/issue-1586
...
Refactor directory checks to prevent assumptions
2017-08-15 17:02:19 -04:00
Connor Tumbleson
a1cb15d721
add additional tests for (json/png) deflated unknown files
2017-08-15 17:01:53 -04:00
Connor Tumbleson
79454823b3
Refactor directory checks to prevent assumptions
...
- only checks directory path of apktool framework location
- fixes #1586
2017-08-15 15:52:46 -04:00
Connor Tumbleson
f9c091f54b
refactor sdk codename to sdk level into function
2017-08-15 15:35:26 -04:00
Connor Tumbleson
15bc16c6bd
Survive decoder if malformed string is encountered
...
- fixes #1564
2017-07-27 06:55:18 -04:00
Connor Tumbleson
eda95b3da2
Don't read more data than entryChunk has
...
- fixes #1534
2017-07-26 16:21:59 -04:00
Connor Tumbleson
0f0ec681b7
Detect root file path on windows vs others
2017-07-26 08:22:27 -04:00
Connor Tumbleson
dbb144f9af
Throw nasty warnings if JAXP 1.5 support isn't present
...
- JAXP 1.5 allows us to check for XML XXE/OOB malicious tricks
- Fixes #1553
2017-07-17 14:12:14 -04:00
Connor Tumbleson
34b4cfd515
Merge branch 'master' into master
2017-07-12 14:45:53 -04:00
Marc Miltenberger
5359ac0ef5
Make sure to close the file after reading in. The parse(File) method does not close the file under all circumstances.
2017-07-12 20:16:00 +02:00
Connor Tumbleson
2bd10a7d9f
Internalize constants to not rely on JDKs
2017-07-08 14:20:26 -04:00
Connor Tumbleson
3bbab052c4
spelling fix
2017-07-06 10:15:44 -04:00
Connor Tumbleson
1c23bb3962
remove duplicate code in favor of function
2017-07-05 15:44:10 -04:00
Connor Tumbleson
657a44f593
Stop DOCTYPE decl dead in the tracks
2017-07-05 15:36:54 -04:00
Connor Tumbleson
1c0d6abb75
update license headers
2017-07-05 12:45:51 -04:00
Connor Tumbleson
02c8b62b00
Prevent malicious directory/file work with unknown files
2017-07-05 12:45:17 -04:00
Connor Tumbleson
1597c12472
changed all license files
2017-07-05 12:05:52 -04:00
Connor Tumbleson
2a1160f720
Add unit test for kotlin applications
2017-07-04 09:55:50 -04:00
Connor Tumbleson
93d61cc07a
kotlin folder should not be treated as unknown - #1520
2017-07-04 09:55:50 -04:00
Connor Tumbleson
26512c7737
update internal framework to API 26 (Final O Dev Preview)
...
- refs #1520
2017-07-03 08:11:15 -04:00
Connor Tumbleson
6ce02e143d
update internal aapt to API 26
...
- refs #1520
2017-07-03 08:10:59 -04:00
Bing Qiao
28883538a7
Class.class.getResourceAsStream tries to load resource from root directory. This fails when apktool is built into a fat jar like Spring boot executable so that the classloader tries to load the resource from the root directory of the Spring boot jar instead of that of the bundled appktool jar.
2017-06-29 12:36:05 +01:00
Connor Tumbleson
40ece96a1a
remove shorthand if statement syntax
2017-06-28 10:09:15 -04:00
Marc Miltenberger
5d383e4a62
Basically, on import getResSpec is called multiple times and very often throws an exception. Returning null is much faster and therefore in cases where the caller does not rely on a thrown exception, it may use the new getResSpecUnsafe method.
2017-06-28 11:24:40 +02:00
Connor Tumbleson
28848319af
Skip resources for test
2017-06-11 17:40:25 -04:00
Marvin Killing
4ce8a00180
Merge branch 'master' into issue-1498
2017-06-09 22:56:04 +02:00
Connor Tumbleson
dab59a2aec
Adding a few random AOSP 9 patch images to more test suite more robust.
2017-06-09 08:20:41 -04:00
Connor Tumbleson
4a3e24666e
code style cleanup
2017-06-08 16:51:28 -04:00
Connor Tumbleson
b6751f893c
add test for #1511
2017-06-08 16:51:16 -04:00
Connor Tumbleson
bd62f7e3e5
Merge branch 'fix-optical-inset' of https://github.com/phhusson/Apktool into phhusson-fix-optical-inset
2017-06-08 15:52:14 -04:00
Connor Tumbleson
a918b49bff
Update internal aapt's to android-7.1.2_r11
...
- fixes #1516
2017-05-30 08:59:06 -04:00
Connor Tumbleson
e794508869
cleanup tests
2017-05-27 15:23:39 -04:00
Connor Tumbleson
f19317d87c
Prevent doctypes declarations
2017-05-27 15:12:54 -04:00
Pierre-Hugues HUSSON
2a35125441
Merge branch 'master' into fix-optical-inset
2017-05-26 10:07:29 +02:00
Connor Tumbleson
a00da345b2
code style cleanup
2017-05-25 07:02:23 -04:00
Connor Tumbleson
c3ea300b96
Add unit-test for #1508
2017-05-25 07:02:10 -04:00
Connor Tumbleson
d2e16044bd
Merge branch 'fix-grayalpha-9patch' of https://github.com/phhusson/Apktool into phhusson-fix-grayalpha-9patch
2017-05-25 07:00:00 -04:00
Connor Tumbleson
15c4f333a5
Correctly decode arrays.xml
...
- #1453
- temporarily cast unknown enum (0) to ResArray
2017-05-24 08:09:05 -04:00
Connor Tumbleson
59df68911d
update aapts with latest patch
...
- c81b3899fe
2017-05-23 09:27:59 -04:00
Connor Tumbleson
d979247794
patches for style decoding
2017-05-23 09:27:27 -04:00
Pierre-Hugues Husson
60f32f7365
Decode OpticalInset cf #1511
2017-05-22 22:28:10 +02:00
Pierre-Hugues Husson
dd32f9414d
In case of a grayscale + alpha 9patch, work-around JDK.
...
Original code:
https://worldwind31.arc.nasa.gov/svn/trunk/WorldWind/src/gov/nasa/worldwind/util/gdal/GDALUtils.java
/JDK-5051418
Cf Bug #1508
2017-05-20 13:49:40 +02:00
Connor Tumbleson
390ecae6c5
Handle strings with style index at end of string
2017-05-19 09:28:44 -04:00
Marvin Killing
f979f202c7
Add failing test for #1498
2017-05-09 21:54:37 +02:00
Connor Tumbleson
e1f7ac355e
add support for preview builds (N, O)
2017-05-08 09:03:13 -04:00
Connor Tumbleson
b09dce4050
Prevent loading styles if style position is outside of string
...
- fixes #1453
2017-05-08 09:03:13 -04:00
Connor Tumbleson
e723e6e68f
Prevent over escaping plurals item tags
2017-05-08 08:34:17 -04:00
Connor Tumbleson
015f3a734b
Add unit test for #1456
2017-05-08 08:34:03 -04:00
Connor Tumbleson
429e18ac25
Move MXSerializer to unique namespace
...
- prevents dependency version from loading
- patch MXSerializer to skip duplicate namespaces at same depth
2017-05-08 08:33:49 -04:00
Connor Tumbleson
90b7d4b9b5
move common output to fine LOG level
...
- only visible in VERBOSE
2017-05-05 07:51:24 -04:00
Connor Tumbleson
e2f77aac18
Pass exception back to user
...
- check object is not null before closing
- refs #1160
2017-05-05 07:46:56 -04:00
Connor Tumbleson
e4db1fa8d6
Prevent closing objects that may not exist.
2017-05-04 17:53:54 -04:00
Connor Tumbleson
5e94801de1
add passing test for #1431
2017-05-02 08:38:32 -04:00
Connor Tumbleson
488b9d58dd
code style changes
2017-05-02 08:16:07 -04:00
Marc Miltenberger
66c1b46865
Closing Framework and APK after use
...
This commit should fix https://github.com/iBotPeaches/Apktool/issues/1160
2017-05-02 08:21:09 +02:00
Connor Tumbleson
2d5337d3cb
Keep baksmali options same as previous apktool
2017-04-25 08:42:01 -04:00
Alexei Khlebnikov
0fa6418553
fix of binary xml string length encoding, now supporting long resource strings
2017-04-04 17:19:21 +02:00
Connor Tumbleson
74f76ae71d
Upgrade to smali 2.2
2017-03-27 09:16:11 -04:00
Connor Tumbleson
1b55105042
Skip UTF8 test on Windows
...
- fixes #1414
2017-01-19 06:12:41 -05:00
Connor Tumbleson
dd4a207ec4
forgot to strip symbols from 64 bit unix aapt
2017-01-16 12:30:35 -05:00
Connor Tumbleson
e3c6db33df
Merge pull request #1413 from peter23/master
...
show message about null references
2017-01-16 08:40:12 -05:00
Connor Tumbleson
71488bbf61
Force pkgId for applications that have a non-standard pkgId
2017-01-16 07:35:40 -05:00
Peter M
c3fc2fe260
show message about null references
2017-01-13 16:49:58 +03:00
Connor Tumbleson
b60db0917d
Add support for 3 non-positional attributes
...
- fixes #1360 & fixes #1405
- add tests
2017-01-13 07:06:38 -05:00
Connor Tumbleson
0571cccaff
Merge pull request #1395 from iBotPeaches/issue/1394
...
Refactor ExtFile to brut.j.dir
2016-12-29 09:34:37 -05:00
Connor Tumbleson
de8041cb6f
Add new aapt binaries
...
- 32/64 unix
- windows
2016-12-29 09:09:03 -05:00
Connor Tumbleson
6e86fa9fcd
retain backward compatibility w/ old ExtFile extended to new location
2016-12-26 07:37:54 -05:00
Connor Tumbleson
78a7724725
manually replace %20 w/ space
2016-12-25 08:47:20 -05:00
Connor Tumbleson
891d0d39e0
Refactor ExtFile to brut.j.dir
...
- move to using Paths when possible
- adapt calls to FileDirectory to leverage Paths
2016-12-25 07:57:41 -05:00
Connor Tumbleson
b6127d2a31
Ignore filename checks to allow unicode filenames
...
- fixes #1369
- aapt binaries for mac osx
2016-12-24 07:45:54 -05:00
Connor Tumbleson
166bf508e2
Add "--no-version-vectors"
...
- fixes #1384
- prevents aapt versioning vectors on rebuild
2016-12-23 09:11:43 -05:00
Connor Tumbleson
31d015fe37
Add new aapt binaries for macosx
2016-12-23 07:30:46 -05:00
Connor Tumbleson
dae52d3899
Add new aapt binaries
...
- 32/64 unix
- windows
2016-12-22 09:06:25 -05:00
Andrei Conache
983e0ad111
fix TYPE_DYNAMIC_ATTRIBUTE support
2016-12-20 14:09:10 +01:00
Connor Tumbleson
c1cb9425d5
Don't write out a null spec
...
- #1370
2016-12-02 15:32:31 -05:00
Connor Tumbleson
5798c9200f
Add unit-test (no unicode)
...
- #1369
2016-12-02 14:28:06 -05:00