Commit Graph

2088 Commits

Author SHA1 Message Date
d4b2314e26 Merge branch 'issue-2251' of https://github.com/chris-sharl/Apktool into chris-sharl-issue-2251 2020-04-11 06:43:54 -04:00
b4493a51bb build: set calendar year to start date (2010) of project 2020-04-11 06:33:23 -04:00
3f831c8221 refactor: copyright year should be year started, not current year 2020-04-11 06:33:05 -04:00
699bb62d6c Merge branch 'update-project' of https://github.com/friederbluemle/Apktool into friederbluemle-update-project 2020-04-11 06:24:52 -04:00
54c3cfedf5 Use JAVA_HOME on windows if defined 2020-04-11 06:09:51 -04:00
81ca785e02 Fix file header comment format 2020-02-29 17:37:46 -08:00
fec0193362 Update hierynomus.license to 0.15.0 2020-02-29 17:37:45 -08:00
51240d17e6 Update Gradle Wrapper to 5.6.4 2020-02-29 17:34:52 -08:00
f3136bc52b build: update jdk8 to 211 from 231 (?) 2020-02-05 06:44:36 -05:00
5272ae24b3 fix issue-2251 2019-12-19 18:39:04 +08:00
0143dcfd24 build: start new dev cycle (2.4.1-SNAPSHOT) 2019-11-29 18:16:06 -05:00
511718ef3a build: version bump (2.4.1) 2019-11-29 11:55:57 -05:00
ee54853718 feat: update internal framework to API 29 (10 Release) 2019-11-29 11:43:31 -05:00
b05f19b80d fix: patch aapt2 to not run custom commands on passed aapt2 binary 2019-11-20 06:46:06 -05:00
d6f38e38cd Only attempt to use -e option when the packaged aapt binary is used. 2019-11-20 06:46:06 -05:00
5d488e5f22 Create file containing the do-not-compress extensions and pass it to aapt. 2019-11-20 06:46:06 -05:00
11ea666c13 Merge branch 'master' of github.com:iBotPeaches/Apktool 2019-11-19 06:55:46 -05:00
aedee6052f Merge branch 'realityJie-fix/uncompressed_files_bug' 2019-11-19 06:55:41 -05:00
b02b265ae2 style: cleanup syntax 2019-11-19 06:55:27 -05:00
7910802648 Merge branch 'fix/uncompressed_files_bug' of https://github.com/realityJie/Apktool into realityJie-fix/uncompressed_files_bug 2019-11-19 06:53:00 -05:00
c1f9afe33c fix: enhance bitness detection on windows 2019-11-19 06:45:07 -05:00
f076def4c5 docs: update internal information for building aapt 2019-11-18 19:59:51 -05:00
37505ff509 build: update aapt/aapt2 binaries to 71b16b59 (mac) 2019-11-18 19:48:33 -05:00
9e75e593a6 build: update aapt/aapt2 binaries to 71b16b59 (windows) 2019-11-18 19:48:33 -05:00
557b763c1c build: update aapt/aapt2 binaries to 71b16b59 (unix) 2019-11-18 19:48:33 -05:00
661f929c77 docs: no 32bit for mac 2019-11-17 14:21:20 -05:00
fdbc604209 docs: update internal aapt/aapt2 build instructions 2019-11-17 14:16:59 -05:00
17ad91da61 fix bug of Unrecognized option: --only-main-classes 2019-11-15 08:47:22 -05:00
31a23ba493 Fix AXML parser to handle obfuscated attribute names
This adds an additional check if the attribute namespace belongs to
Android namespace, and if so we try to decode using attribute decoder.

Fixes #1576.
2019-11-14 18:37:25 -05:00
31f25bc561 build: update jdk8 to 231 from 221 2019-11-14 08:15:56 -05:00
5197e21d75 there files should not be compressed:
1.base on AOSP's frameworks/base/tools/aapt/Package.cpp: NO_COMPRESS_PATTERN = Pattern.compile("(jpg|jpeg|png|gif|wav|mp2|mp3|ogg|aac|mpg|mpeg|mid|midi|smf|jet|rtttl|imy|xmf|mp4|" +
            "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|mkv)$"); specifically this rule include 9patch files.
2.file has not ext
3.the compressive type is store

warning:
even if there are the same type of files, they are compressive type may different, just like this example:
-rw----     1.0 fat     8343 b-  0% stor 80-Jan-01 08:00 assets/resources/assets/effect/common/ctp_trail15_1_tex.unity3d
-rw----     1.0 fat    11526 b-  0% stor 80-Jan-01 08:00 assets/resources/assets/effect/common/ctp_trail15_tex.unity3d
-rw----     2.0 fat     2483 bl 19% defN 80-Jan-01 08:00 assets/resources/assets/effect/common/cw_310300_cylq_ql01_mat.unity3d
-rw----     2.0 fat     9467 bl 17% defN 80-Jan-01 08:00 assets/resources/assets/effect/common/cw_310300_cylq_ql03_fbx.unity3d
ctp_trail15_1_tex.unity3d and ctp_trail15_tex.unity3d are uncompressed, but cw_310300_cylq_ql01_mat.unity3d and cw_310300_cylq_ql03_fbx.unity3d are compressed.

That is why I modified recordUncompressedFiles Method.
2019-11-14 12:02:49 +08:00
6d2878cca1 Merge pull request #2199 from IgorEisberg/master
build: update to smali/baksmali 2.3.4
2019-10-20 14:38:26 -04:00
a33141646b Fix JDK 11 build 2019-10-20 21:23:30 +03:00
232e801e4d build: update to smali/baksmali 2.3.4 2019-10-18 04:03:53 +03:00
197d468727 Merge pull request #2175 from danielmalmq/master
Fixes issue with decoding apk containing a zero byte 9patch
2019-10-06 05:24:04 -04:00
03c1de4800 Merge pull request #2182 from JingYeoh/bugfix/arsc/multipackage
bugfix, fix get wrong package ResPackage for multi-pkg resources.arsc.
2019-10-06 05:22:00 -04:00
9e39755750 bugfix, fix get wrong package ResPackage for multi-pkg resources.arsc. 2019-09-23 18:39:18 +08:00
dc312a5336 Fixes issue with decoding apk containing a zero byte 9patch 2019-09-19 13:34:06 +02:00
2264e61a51 Merge pull request #2159 from friederbluemle/update-gradle-wrapper
Update Gradle wrapper to 5.6.2
2019-09-09 16:55:12 -04:00
7f1d73e7f0 Update Gradle wrapper to 5.6.2 2019-09-05 15:32:54 -07:00
683fef32ac Merge pull request #2153 from iBotPeaches/issue-2071
Update to smali/baksmali v2.3.0
2019-08-17 11:33:55 -04:00
d2bfa79a24 build: update jdk8 to 221 from 211 2019-08-17 10:32:44 -04:00
fefc5e226a refactor: use MultiDexContainer instead of DexBackedDexFile 2019-08-17 07:00:15 -04:00
945ce9b3d4 build: update to smali/baksmali 2.3.0 2019-08-17 06:59:54 -04:00
75e4c61a1a Merge pull request #2138 from friederbluemle/update-gradle-wrapper
Update Gradle wrapper to 5.5.1
2019-07-30 17:54:49 -05:00
e498ad887a Update Gradle wrapper to 5.5.1 2019-07-22 12:06:15 -07:00
c2065995ed feat: update internal framework to API 29 (Q Beta 4)
- fixes: #2131
2019-07-20 12:32:14 -04:00
f58e043c67 Merge pull request #2072 from iBotPeaches/issue-2058
Prevent directory traversal on asset decoding
2019-07-20 11:10:31 -04:00
4aa933b31a test: ensure we don't allow path traversal with win 2019-07-18 07:42:34 -04:00
47854ec757 fix: experimental fix to prevent path traversal with copied folders 2019-07-18 07:42:34 -04:00