Commit Graph

887 Commits

Author SHA1 Message Date
Connor Tumbleson
b7c56c8928
Tests / Style for #2815 (#2817)
* style: reorg getAttributes (StyledString)

* test: assertion for aapt2 string (#2815)
2022-05-23 07:09:27 -04:00
Igor Eisberg
c1f6dc792a
fix: redesign StyledString decoding (#2816)
* fix: redesign StyledString decoding

* optimize: avoid calling span.getName() twice

* fix: order spans due to aapt1/2 discrepancy
* fixes: #2815
2022-05-23 06:40:48 -04:00
erev0s
8fab4bfb3d
added option to include generic/permissive network security config file durin… (#2791)
* added option to include permissive network security config file during build

* added tests for app with existing network config and for app without

* minor fixes for pull 2791

* refactor: slim down test app for network config

* style: remove extra newlines

* refactor: moved network tests to aapt2

* refactor: remove unused exceptions

* test (aapt2): ensure aapt2 is used for net-sec-conf

* fix (cli): block use of net-sec-conf on aapt1

* fix conflict

Co-authored-by: Connor Tumbleson <connor@sourcetoad.com>
Co-authored-by: Connor Tumbleson <connor.tumbleson@gmail.com>
2022-05-07 06:52:07 -04:00
Connor Tumbleson
d38eceedae
test (aapt/aapt2): ensure ampersand is escaped on android:label (#2802)
* test (aapt/aapt2): ensure ampersand is escaped on android:label

* build (workflow): ensure test changes force ci rebuild
2022-04-24 17:33:11 -04:00
Connor Tumbleson
420406b553
test (aapt2): add assertion for "usesPermissionFlags" (#2790) 2022-03-28 07:07:20 -04:00
Connor Tumbleson
b910df79dd
New aapt/aapt2 binaries (#2787)
* feat: new aapt1/aap2 binaries for mac (static)

* feat: new aapt1/aapt2 binaries for unix/mac (static)

* feat (aapt2): allow reserved pkgIds
2022-03-28 06:53:42 -04:00
Connor Tumbleson
fc28ac56ef
Merge pull request #2785 from iBotPeaches/revert-2650-fix-private-reference
Revert "fix: decoding references to private resources"
2022-03-21 07:44:22 -04:00
Connor Tumbleson
49071d0fb0
feat: update internal framework to API 31 (12 Release) (#2743)
* feat: update internal framework to API 31 (12 Release)

* refactor: rename enums for new overlays/stagedAliases

* fix: introduce basic staged alias support

* feat: update internal framework to API 32 (12L Release)

* fix: add support for overlay spec skipping
2022-03-21 07:20:04 -04:00
Connor Tumbleson
c300184780
fix: add support for overlay spec skipping 2022-03-21 07:03:14 -04:00
Connor Tumbleson
26f39ee736
feat: update internal framework to API 32 (12L Release) 2022-03-21 07:02:54 -04:00
auermich93
e105768592
fixes issue #2473 (#2783) 2022-03-21 06:51:15 -04:00
Connor Tumbleson
df3b9f7c56
fix: introduce basic staged alias support 2022-03-13 08:34:45 -04:00
Connor Tumbleson
e9a3993da8
refactor: rename enums for new overlays/stagedAliases 2022-03-13 08:34:31 -04:00
Connor Tumbleson
951d063cbd
feat: update internal framework to API 31 (12 Release) 2022-03-13 07:55:51 -04:00
Connor Tumbleson
31af56a430
feat: introduce SDK_S_V2 (#2780) 2022-03-13 07:39:54 -04:00
Connor Tumbleson
4065717b45
Preventing instantiation of untrusted classes. (#2760 - CVE-2022-0476)
* fix: enforce allowable classes during yaml parsing

* fix: rename class to reference escaping nature of strings

* test: assertion for parsing malicious yaml
2022-02-19 09:12:04 -05:00
Connor Tumbleson
a269a8e0d5
refactor: drop unused exceptions (#2746) 2022-01-18 08:18:33 -05:00
Connor Tumbleson
797fc3e332
fix: prevent file hold on tmpDir during build (#2745) 2022-01-18 07:32:41 -05:00
Connor Tumbleson
ddc4bb360a
Cleanup trailing temp files/folders (#2742)
* test: add missing afterClass to cleanup BRUT* directory

* fix: properly cleanup apkFile temp after buildManifest
2022-01-17 07:19:22 -05:00
Al Sutton
95874be448
Replace use of deprecated methods with their recommended replacements (#2713)
* Replace use of deprecated methods with their recommended replacements

* Add scripting jmod to proguard inputs
2021-12-13 06:27:19 -05:00
Connor Tumbleson
6cfe2987e5
fix: support for signature scheme v4 (#2705) 2021-11-27 07:41:15 -05:00
Yaroslav
d29411117e
fix: decoding references to private resources (#2650)
* fix: decoding references to private resources

* style: fix naming in constructor parameter

* test: add test to check build/decode private references
2021-10-17 12:01:54 -04:00
Connor Tumbleson
9bdf385538 style: cleanup build vs Build 2021-09-06 06:59:30 -04:00
Connor Tumbleson
0f690e4654 refactor: remove redundant suppression 2021-09-06 06:59:30 -04:00
Connor Tumbleson
3118b54632 refactor: extract common element from if statement 2021-09-06 06:59:30 -04:00
Connor Tumbleson
d48b407f5b fix: remove unused exceptions in CLI 2021-09-06 06:59:30 -04:00
Connor Tumbleson
3b179f8750 refactor: rename ApkOptions -> Options/BuildOptions 2021-09-06 06:59:30 -04:00
Connor Tumbleson
3f09781939
docs: add missing docblocks for getHTML() in StringBlock 2021-09-01 07:40:41 -04:00
Connor Tumbleson
5fa165a023
refactor: deprecations for 2.6.0 are now 3.0.0
* 2.6.0 -> 2.6.1 (fixes, quicker release)
 * 2.6.0 -> 3.0.0 (big picture, breaking change, slower release)
2021-09-01 07:25:58 -04:00
Connor Tumbleson
99166e3609
refactor: change test name of aapt2 issue 2632 2021-08-30 21:38:01 -04:00
Connor Tumbleson
851309dde0
Merge branch 'master' into refine 2021-08-30 21:17:49 -04:00
itaybia
087142d4cf
fix wrong HTML start/end tags in strings.xml (#2631)
* fix wrong HTML start/end tags in strings.xml
2021-08-30 21:15:23 -04:00
Connor Tumbleson
0645821883
fix: remove unneeded depth/logic in serializer 2021-08-30 20:59:53 -04:00
Connor Tumbleson
2e3f22af7c
refactor: log first package if 2 2021-08-30 20:59:38 -04:00
Goooler
5c6d091f39 Merge branch 'master' into refine 2021-08-30 18:48:04 +08:00
Connor Tumbleson
a0c2fef83b feat: new aapt1/aap2 binaries for mac (static) 2021-08-29 11:50:36 -04:00
Connor Tumbleson
caee50b35b test: adjust test for SDK S/T 2021-08-29 07:22:05 -04:00
Connor Tumbleson
f4a75fe761 refactor: remove SDK name from development sdk version 2021-08-29 07:22:05 -04:00
Connor Tumbleson
b80d13b56a fix: add support for proper API 31/S (12) + API 32/T (13) 2021-08-29 07:22:05 -04:00
Connor
fc2f12363d feat: new windows/linux aapt/aapt2 binaries 2021-08-28 14:27:30 -04:00
Connor Tumbleson
394394c3b5 feat: add new aapt/aapt2 binaries 2021-08-28 14:27:30 -04:00
Goooler
c3e8be3e8a Reformat & Rearrange 2021-08-27 01:32:40 +08:00
Goooler
94ed86db28 Code cleanups 2021-08-27 01:16:46 +08:00
Goooler
e25c3636ff Update docs & licenses to use https 2021-08-26 07:40:32 -04:00
Cody Lund
8d59882e5f
Fix: numeric string meta-data value corruption (#2612)
* Fix: handle numeric strings in manifest meta-data value
* fix regex
* scoped solution
* improve comment

Co-authored-by: Cody Lund <colund@microsoft.com>
2021-08-17 07:01:08 -04:00
Connor Tumbleson
eaab729be5
build: remove deprecated jcenter repo location 2021-07-05 19:44:30 -04:00
Connor Tumbleson
e4654e0b5f
fix: write dummy resources as items 2021-07-04 09:49:59 -04:00
IgorEisberg
fad2f99541 style: return DexFile interface from SmaliDecoder 2021-07-04 14:12:38 +03:00
IgorEisberg
6cfa79e456 Determine minSdkVersion with baksmali for JARs + don't compress webp
We take advantage of the fact that baksmali can determine the minimum API version needed for a given collection of opcodes and extract it, then save to mMinSdkVersion, which is only used by smali via buildSourcesSmali.
This change, in addition to my previous change, allows to decompile and recompile JARs without worrying about specifying an API version via -api/--api-level.

As an extra, added webp file extension to NO_COMPRESS_PATTERN, according to AAPT2 standards, and since it's factually never compresses as it's an already compressed format.
https://cs.android.com/android/platform/superproject/+/master:frameworks/base/tools/aapt2/cmd/Link.cpp;l=2328
2021-07-04 02:14:56 +03:00
IgorEisberg
1ed1076a84 correction: don't clear resource table if it was already loaded 2021-07-04 00:16:22 +03:00