Commit Graph

447 Commits

Author SHA1 Message Date
oSumAtrIX
bef4bc1a80
chore: merge upstream
# Conflicts:
#	brut.apktool/apktool-lib/build.gradle
#	build.gradle
2023-01-17 23:39:46 +01:00
oSumAtrIX
a3f72e3e90
feat: revert "Support Spare Flags (#2887)"
This reverts commit dc3667db until related issue https://github.com/iBotPeaches/Apktool/issues/2836 is solved.
2023-01-17 23:32:01 +01:00
oSumAtrIX
fe8ba82b0b
fix: throw correct exceptions 2023-01-17 23:32:00 +01:00
Danealau
8749e2a6c4
fix: support (name removed) res items. (#2940)
* fix:  res/layout/(name removed).xml: Invalid file name: must contain only [a-zA-Z0-9$_.] error

* refactored fix
2022-11-16 19:52:55 -05:00
Connor Tumbleson
22f2e6fb23
fix: support properly mapping r/R/res resources during disassemble (#2936) 2022-11-13 18:06:25 -05:00
Connor Tumbleson
ef83dc2f04
fix: don't assume a referent exists on ReferenceValue (#2926) 2022-11-08 06:56:05 -05:00
Connor Tumbleson
273842279a
Merge branch 'stored_obfuscated_files' 2022-11-08 06:24:49 -05:00
Connor Tumbleson
b32be8ca2a
refactor: rename attributes for storing obfuscated filepath 2022-11-08 06:24:41 -05:00
Miepee
6a70be6c26
make default framework detection on linux xdg-compliant (#2924)
On Linux, check first if $XDG_DATA_HOME is set, if not use path as it was before (~/.local/share/apktool)
2022-11-08 05:54:36 -05:00
Kirlif
c4e8f88499
Fix « doNotCompress » in case of obfuscated resources. 2022-11-07 14:08:49 +01:00
Dominic Lemire
f8df056a2c
fix: overlay spec parsing (#2805) (#2917) 2022-11-02 06:56:49 -04:00
Sven Marquardt
9db742618b
Fixes #2900 (#2901)
Fastst way to fix empty key value splitting for styled strings.

Signed-off-by: Sven Marquardt <dev@mail.smarquardt.space>

Signed-off-by: Sven Marquardt <dev@mail.smarquardt.space>
2022-10-12 06:55:29 -04:00
oSumAtrIX
9443f6fefb
feat: merge iBotPeaches/Apktool 2022-09-23 04:22:53 +02:00
Connor Tumbleson
fc1e21e9ed
fix: correct npe if null is returned from attribute value (#2889) 2022-09-20 07:19:28 -04:00
Connor Tumbleson
dc3667dbd0
Support Spare Flags (#2887)
* support sparse flag

* style: cs changes

Co-authored-by: R0S <41138521+iamr0s@users.noreply.github.com>
2022-09-19 17:18:35 -04:00
Connor Tumbleson
3fff2f128e
Support malformed resource names/namespaces by falling back to resId (#2886)
* Correct falsely-referenced attribute into an entity which is an obfuscated name

* style: correct syntax for custom attributes

* fix: remove unused import

Co-authored-by: MyAnoneNeko <MyAnoneNeko@users.noreply.github.com>
2022-09-19 16:27:43 -04:00
Tvildo
5d6c6c04d2
Fixes Facebook apk deconstruction (#2884) 2022-09-19 12:34:14 -04:00
Lucaskyy
820ef1e4cd
fix: you could make a hollywood movie out of all the hours I spent debugging and eventually after giving up found the solution on this beautiful day. Can you believe it? 2022-07-24 18:17:36 +02:00
Connor Tumbleson
7a2c0c8bb8
fix: correct case when application has no ResPackages
- refs: #2701
2022-07-10 07:42:29 -04:00
Connor Tumbleson
f94cdc5cf3
refactor: mark skips as "fine" to not clog output 2022-07-10 07:38:05 -04:00
Connor Tumbleson
287d4a5922
style: fix missing throws statements on javadoc 2022-07-10 07:34:45 -04:00
Lucaskyy
8cdd9484f7
fix: enable 9patch decoder on any OS 2022-06-28 19:35:02 +02:00
Lucaskyy
d9deba1015
fix: just what??? 2022-06-28 00:32:23 +02:00
Lucaskyy
9bfa4c6040
fix: I refuse to believe this ever happened and that's why this is my essay of refusing to believe I made this mistake. I cannot comprehend the fact I made this mistake, that's why I'm very sad now. Some people don't understand the meaning behind life, I don't understand the meaning behind how the actual fck I made this mistake. Please send help. 2022-06-28 00:17:03 +02:00
Lucaskyy
42747d6f99
fix: disable 9patch decoder 2022-06-27 23:56:13 +02:00
Lucaskyy
12c490196b
fix: create build dir & java 8 compat 2022-06-20 16:41:45 +02:00
Lucaskyy
ede2d09dc8
fix: wrong matrix when drawing 2022-06-18 23:41:36 +02:00
Lucaskyy
a87ac3a46c
feat: Android implementation of 9patch decoder 2022-06-18 22:17:08 +02:00
Sculas
d31e5275dc
fix: get rid of KeyEvent (AWT) 2022-06-18 16:13:43 +02:00
Lucaskyy
e115848dbc
refactor: get rid of all that logging 2022-06-11 19:24:41 +02:00
Lucaskyy
cdc3eefd88
refactor: cleanup some things and catch possible errors 2022-06-11 19:17:09 +02:00
Lucaskyy
4dca2b2d27
refactor: remove aapt provider implementation 2022-06-11 19:05:40 +02:00
Lucaskyy
37470c018d
fix: redo aapt provider implementation 2022-06-11 17:15:38 +02:00
Lucaskyy
08822dcb98
revert: broken aapt2 conversion
This reverts commit 8701360a0b.
2022-06-11 17:10:02 +02:00
Lucaskyy
8701360a0b
refactor: remove aapt1, add aapt2 interface & provider 2022-05-24 13:56:38 +02:00
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
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
c300184780
fix: add support for overlay spec skipping 2022-03-21 07:03:14 -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
31af56a430
feat: introduce SDK_S_V2 (#2780) 2022-03-13 07:39:54 -04:00
Connor Tumbleson
a269a8e0d5
refactor: drop unused exceptions (#2746) 2022-01-18 08:18:33 -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
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
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