Commit Graph

1556 Commits

Author SHA1 Message Date
Connor Tumbleson
f8fe98d9a6 code style 2017-06-29 11:30:00 -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
b45054e65e Merge branch 'MarcMil-master' 2017-06-28 10:09:29 -04: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
ef022466be Upgrade to SnakeYAML 1.18 (Android)
- fixes #591
2017-06-27 17:31:42 -04:00
Connor Tumbleson
acb0044910
start new dev cycle (2.2.4-SNAPSHOT) 2017-06-13 07:31:16 -04:00
Connor Tumbleson
13ec3b6bfa
version bump (2.2.3) 2017-06-12 08:23:44 -04:00
Connor Tumbleson
95f86fc6ed
Merge branch 'playtestcloud-issue-1498' 2017-06-11 17:40:48 -04: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
c93e1b6f3f Merge pull request #1529 from iBotPeaches/robust9patchtest
Adding a few random AOSP 9 patch images to make test suite more robust.
2017-06-09 13:19:34 -04: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
8efa9967e7
adding Sourcetoad sponsorship information
- https://connortumbleson.com/2017/06/07/apktool-sourcetoad-to-sponsor-development/
2017-06-07 19:07:49 -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
6e47d3687b
Merge branch 'phhusson-fix-grayalpha-9patch' 2017-05-25 07:02:34 -04: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
6597da9117
Upgrade to smali 2.2.1 2017-05-25 06:48:55 -04:00
Connor Tumbleson
5ec25c9e37 Merge pull request #1493 from iBotPeaches/issue-1453
Android O Preview Support
2017-05-24 15:48:12 -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
0e6eaf9e67
update internal docs with gradle tips 2017-05-23 09:28:14 -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
693f592b13 Ignore file entries containing '..' in the APK file to fix #1498
Zip/APK files can legally contain entries that point to the parent directory of the one in which the .zip is located.
Usually, unzip implementations ignore them by default, and we‘ll do the same.
2017-05-09 22:17:45 +02: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
ea16f3ff1d Merge pull request #1496 from iBotPeaches/shadow-jar
Shadow Jar
2017-05-08 09:02:47 -04:00
Connor Tumbleson
966c861d2f
s/fatJar/shadowJar 2017-05-08 08:45:39 -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
dfbcf298c2
Move to shadowJar, leaving fatJar behind
- plugin was deprecated
2017-05-08 08:33:12 -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
7947f115b0 Merge pull request #1492 from iBotPeaches/issue-1160
Prevent closing objects that may not exist.
2017-05-05 07:13:30 -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
af1e24be64
Merge branch 'MarcMil-master' 2017-05-02 08:16:21 -04:00