Commit Graph

946 Commits

Author SHA1 Message Date
dc33533d76 add tests, make public method 2017-09-19 15:09:25 -04:00
21e9dd514c cs cleanup 2017-09-19 14:42:14 -04:00
4ba1a035ae Merge branch 'master' of https://github.com/Promon/Apktool into Promon-master 2017-09-19 14:41:04 -04:00
abfa087d7f Merge branch 'issue-1589' 2017-09-19 14:40:31 -04:00
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
a0ae7eaea8 Skip any file attempting to use relative paths
- fixes #1589
2017-09-03 18:12:57 -04:00
f4ae717c96 Merge branch 'master' of https://github.com/xpirt/Apktool into xpirt-master 2017-09-01 15:55:52 -04:00
5a17843284 Merge branch 'master' of https://github.com/xpirt/Apktool 2017-08-27 18:20:23 +02:00
5cdbca30fd fix #970 and add long api level option 2017-08-27 18:20:20 +02:00
14c5f87e6e fix indentation 2017-08-27 16:21:54 +02:00
c6b2f26021 update CLI commons API and optimize imports
- fixed deprecated API warnings
2017-08-27 16:12:06 +02:00
1c33fba646 close reader as well if syntax error 2017-08-27 09:57:32 -04:00
d6e676c583 Merge branch 'patch-1' of https://github.com/footpatch/Apktool into footpatch-patch-1 2017-08-27 09:56:39 -04:00
78a80d14b0 Merge pull request #1601 from xpirt/master
fix potential class cast exceptions
2017-08-27 09:55:13 -04:00
e9618fae6b Windows binary is still 32 bit 2017-08-27 09:54:36 -04:00
9abaa4ee30 fix potential class cast exceptions
- fixes #1444
2017-08-27 15:23:08 +02:00
1fddb05b71 Close input stream in SmaliMod.java 2017-08-25 20:47:31 +02:00
ff8245af97 update internal framework to API 26 (Android Oreo) 2017-08-24 22:54:42 -04:00
67b2325136 add font test 2017-08-24 22:49:43 -04:00
fa966d2d66 Drop 32 bit binaries
- update unix/win/mac 64 bit binaries
 - fixes #1598
 - refs #1594
2017-08-24 15:53:52 -04:00
91ef166ffb unix aapt binaries - apktool-8.0.0_r4 2017-08-24 06:31:04 -04:00
800394cf30 new qualifiers require v26 naming 2017-08-23 17:53:33 -04:00
adeffe3e98 Initial work at qualifier test suite changes 2017-08-23 17:04:26 -04:00
c818dc85f0 mac aapt binaries - apktool-8.0.0_r4 2017-08-23 17:04:11 -04:00
0f4cfcb892 Tweak colorimetry to colorMode 2017-08-23 17:03:51 -04:00
68a7eb7a74 example applications (sparse & not) tests
- update ARSCDecoder to detail sparse applications
2017-08-23 14:43:57 -04:00
6473611d47 Initial work for Sparsed Resource Types
- die out if encountered
2017-08-23 14:14:48 -04:00
bf44f9b809 Support for Color HDR & Gamut 2017-08-23 13:53:30 -04:00
eee73b945d Support for VRHeadset Qualifier 2017-08-23 13:05:08 -04:00
f886c7094d Merge pull request #1590 from iBotPeaches/issue-1586
Refactor directory checks to prevent assumptions
2017-08-15 17:02:19 -04:00
a1cb15d721 add additional tests for (json/png) deflated unknown files 2017-08-15 17:01:53 -04:00
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
f9c091f54b refactor sdk codename to sdk level into function 2017-08-15 15:35:26 -04:00
15bc16c6bd Survive decoder if malformed string is encountered
- fixes #1564
2017-07-27 06:55:18 -04:00
eda95b3da2 Don't read more data than entryChunk has
- fixes #1534
2017-07-26 16:21:59 -04:00
0f0ec681b7 Detect root file path on windows vs others 2017-07-26 08:22:27 -04:00
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
34b4cfd515 Merge branch 'master' into master 2017-07-12 14:45:53 -04:00
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
2bd10a7d9f Internalize constants to not rely on JDKs 2017-07-08 14:20:26 -04:00
3bbab052c4 spelling fix 2017-07-06 10:15:44 -04:00
d0d84bf569 slight formatting cleanup 2017-07-05 16:00:02 -04:00
1c23bb3962 remove duplicate code in favor of function 2017-07-05 15:44:10 -04:00
657a44f593 Stop DOCTYPE decl dead in the tracks 2017-07-05 15:36:54 -04:00
1c0d6abb75 update license headers 2017-07-05 12:45:51 -04:00
02c8b62b00 Prevent malicious directory/file work with unknown files 2017-07-05 12:45:17 -04:00
1597c12472 changed all license files 2017-07-05 12:05:52 -04:00
e7e8747792 Exit application only after version command 2017-07-05 11:06:34 -04:00
2a1160f720 Add unit test for kotlin applications 2017-07-04 09:55:50 -04:00
93d61cc07a kotlin folder should not be treated as unknown - #1520 2017-07-04 09:55:50 -04:00