Commit Graph

508 Commits

Author SHA1 Message Date
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