Commit Graph

139 Commits

Author SHA1 Message Date
Connor Tumbleson
f3e21023ac Prefix integers only exceeding 9 digits to treat as string
- This prevents small numbers like "1" to become "\ 1"
 - added unit tests
 - fixes #1130
2016-02-10 08:05:54 -05:00
Connor Tumbleson
e82ef1034a actually run issue 1063 unit test 2016-02-10 07:54:58 -05:00
Rover12421
123912d226 Apktool.yml file (MetaInfo) using object serialization
non-printable character more intuitive, does not affect printable
character view
2016-01-22 06:28:03 -06:00
Connor Tumbleson
d5ca4c12a1 fix #1123
- correctly handles @null in xml
 - added unit test
2016-01-22 06:07:49 -06:00
Ira Hanson
09525bf657 Change non-printable character for Windows compatibility 2016-01-03 16:51:29 -06:00
Ira Hanson
719553aef0 Test APKs with non-printable characters in filenames 2016-01-03 13:35:54 -06:00
Ira Hanson
8232ee0ea8 Consistently encode unknown filenames to prevent cast error 2016-01-02 21:40:15 -06:00
Connor Tumbleson
9618ce9759 [skip] code spacing, right margin is 120 chars 2015-12-18 11:31:43 -06:00
Connor Tumbleson
ba7393d705 Fixes #767
Handles large int values in AndroidManifest.xml, by prefixing
with `\ ` which aapt treats a string. This prevents truncation
from overflow.

Superseeds PR#1007 - thanks to gio73 for initial research &
MarchMil for continued investigation.
2015-12-18 11:30:28 -06:00
Connor Tumbleson
8374839427 MNC, noticed recently in API 23, is no longer 0 padded. So mnc001 is now mnc1
- Frameworks between froyo and honeycomb have mnc001, etc
 - A size check of ResConfig header for less than 32 (honeycomb) uses old decode method
 - Greater than 32 bytes moves to new decode method of mnc# vs mnc###
2015-12-01 08:48:31 -06:00
Connor Tumbleson
5f5f50f6fd Fixes edge case where mnc = 1, with no mcc field. Fixes #1072 2015-11-01 06:17:29 -06:00
Connor Tumbleson
8fee3499e3 add unit-test for #1063 2015-10-15 10:52:01 -05:00
Connor Tumbleson
26b883ac3b Updated unit-tests to include API 23 tests 2015-10-08 06:58:32 -05:00
Connor Tumbleson
52dc52c2d3 add failing unit-test for reference in attribute 2015-09-12 15:07:32 -05:00
Connor Tumbleson
8254764c6c More robust ResFileValue detection
Previously in 4882396163, strings that
resembled a filepath (ie res/foo/file), would be assigned to a
ResFileValue, which when attempted to be casted to ResScalarValue would
error out.

Attempting to check the filesystem for such files, slowed apktool's
execution majorly. In order to prevent this, the ClassCastException
and other checks related to checking ResFileValue when type is string
was added.

This allows bogus strings such as (res/foo/file) to be added, but the
exception is caught and allows decoding to continues. Fixes #921.
2015-05-14 13:27:22 -05:00
Connor Tumbleson
c659df9dce Correctly add version qualifier when decoding
- fixes #928
2015-04-29 07:49:02 -05:00
Connor Tumbleson
960d111a1e cleanup unit-tests to remove hacky renaming of control 2015-04-22 07:20:29 -05:00
Connor Tumbleson
5d405fa842 add a unit-test for provider attr changing 2015-04-18 08:44:25 -05:00
Connor Tumbleson
bb6cd98dfa fix regression of lang qualifiers
- values-xx was improperly decoded as values-b+xx
 - added unit test
2015-04-11 12:39:38 -05:00
Connor Tumbleson
da3b8c710d cleanup messy logic for bcp qualifiers 2015-04-11 11:36:31 -05:00
Connor Tumbleson
aee0792e00 Suppress overwriting platformBuildVersion[Code/Name]
- fixes #890
 - introduces unit-test comparing manifest
2015-04-04 07:40:38 -05:00
Connor Tumbleson
ae15b2a7f7 fixes #900
- removes aapt test (no longer needed)
2015-04-02 08:15:39 -05:00
Greg Leach
628286c022 Java NIO doesn't allow the preservation of the compression method (STORED vs DEFLATED), so unfortunately we need to fall back to ZipEntry-based output for unknown files. 2015-03-24 20:14:05 -07:00
Connor Tumbleson
39fea5fa2c [tests] add test for shared library rebuild 2015-03-14 08:20:18 -05:00
Connor Tumbleson
fac43a62b8 remove dependency on sharedLibrary in apktool.yml 2015-03-14 08:20:00 -05:00
Connor Tumbleson
0a74de4ab0 Shared Library Rebuilding Support
- handles references with shared resources
 - adds support for --shared-lib
 - update unit-tests
2015-03-14 08:04:33 -05:00
Connor Tumbleson
bbc6023068 gracefully handle apks that have strings that resemble filepaths
- ex string res/foo tries to map to resource res/foo
 - looks for dot now, ie res/foo.xml
2015-03-06 17:04:43 -06:00
Connor Tumbleson
d9fda1feda added additional unit-test, cleaned up spacing 2015-03-03 15:38:36 -06:00
Jeremy Hornberger
5076612c87 Ampersand in "<" gets replaced with "&" in plural strings 2015-03-03 15:38:35 -06:00
Connor Tumbleson
dc02abcf51 Add support for more BCP combinations
- region, variant, script & language combined
 - 2 char language, 2 char region
 - 2 char lang, 4 char script, 3 char variant
2015-02-21 16:48:48 -06:00
Connor Tumbleson
505790fcfe First Pass of BCP47 tests
- variant test
 - script test
 - 3 char packed test
 - alone LTR test
2015-02-19 09:06:44 -06:00
Connor Tumbleson
af65dea319 Initial support for BCP47 tags
- needs script/variant support
- currently only region(s) supported
2015-02-17 11:48:39 -06:00
Connor Tumbleson
20504d1338 Fix improper handling of MNC_ZERO
- add test
 - patch ResConfigFlags
2014-12-30 06:08:23 -06:00
Connor Tumbleson
4882396163 Prevent casting strings that resemble filepaths to ResFileValues
- add testcase
 - adapt changes
 - introduce decodeManifestWithResources which uses attr decoding w/ resources
2014-12-26 08:08:50 -06:00
Connor Tumbleson
499118219e [skip] remove test files after completion 2014-12-25 14:01:34 -06:00
Connor Tumbleson
5dfa79934c [tests] adds tests for shared resources & framework tagging 2014-12-25 12:21:12 -06:00
Connor Tumbleson
cd21bd37a8 [tests] add tests for lollipop (API 21) 2014-11-21 11:26:18 -06:00
Connor Tumbleson
e1a0b9eb8f [tests] add test for watch (api 20) 2014-11-21 11:26:16 -06:00
Connor Tumbleson
40fdfc50a1 Options Cleanup
- remove ugly Hashmap passing
 - create ApkOptions
 - refactor based on ApkOptions
2014-11-01 21:07:02 -05:00
Connor Tumbleson
9031c22365 [skip] update all copyrights to 2014 2014-10-23 18:14:48 -05:00
Connor Tumbleson
869d287aaa Cleanup
- switch to java7 try-with-resources
 - add check in unit-tests for checking control
2014-10-22 22:03:59 -05:00
Connor Tumbleson
986b585f26 Removes hardcoded extension of PNG to allow OEM versions (qmg)
- adds unit-tests via two qmg files (one 9 patch, one regular)
2014-10-22 16:32:05 -05:00
Connor Tumbleson
1489869344 added unit-test and changelog note 2014-10-20 06:51:06 -05:00
Connor Tumbleson
ce15b50c1c handles <string-array> / <array> that require formatted="false" attributes 2014-09-22 18:27:25 -05:00
Connor Tumbleson
18b94d5974 Multiple Dex Support - part 4
- add unit tests
 - minor cs fixes
2014-08-16 08:55:10 -05:00
Connor Tumbleson
c476ce16be Multiple Dex Support - part 2
- CS fixes
 - adds support for building multiple dex
 - prevents extra dex from being unknown and extra dex
 - adds unit-test
2014-08-16 08:29:57 -05:00
Connor Tumbleson
c29dffe554 fix array type values being misrepresented due to incorrect index 2014-05-25 12:37:14 -05:00
Connor Tumbleson
8ad817441f suppress warnings when coming back from Yaml 2014-05-12 17:12:04 -05:00
Connor Tumbleson
f5fc88e463 add travis-ci builds
[travis] skip test on travis

[travis] install 32bit libs
2014-05-09 17:52:29 -05:00
Connor Tumbleson
dbda71d2af [skip] fix output to match a jar 2014-05-03 07:38:49 -05:00
Connor Tumbleson
251a6bbb11 add unit-test for font tags in <array> item 2014-03-19 16:52:07 -05:00
Connor Tumbleson
74153661df add unit-test for jpg image 2014-03-18 10:31:07 -05:00
Connor Tumbleson
d1eb0b01e1 [skip] fixed bad logger name 2014-03-06 09:40:49 -06:00
Connor Tumbleson
119f9d9680 Added jar decode unit-test 2014-03-02 08:46:51 -06:00
Connor Tumbleson
f130c995fb added failing unit-test for bug 603 2014-02-16 11:16:59 -06:00
Connor Tumbleson
19a1a260a0 refactor aapt test into own test class, move helper function into TestUtils 2014-02-10 07:15:32 -06:00
Connor Tumbleson
d90bea10ce malformed styles
if styles are malformed html, then recreation fails with OutOfBounds,
end tag if error occurs to prevent crash
2014-02-09 20:45:16 -06:00
Connor Tumbleson
541301278b add unit-tests (very long strings - greater than 32768 chars) 2014-02-09 18:49:05 -06:00
Connor Tumbleson
cc5ae0f1d1 update unit-tests to handle a simple resource in smali 2014-02-08 17:17:02 -06:00
Connor Tumbleson
7a162fb80f add long-string unit-tests 2013-12-18 08:41:30 -06:00
Connor Tumbleson
52767a2a94 add unicode string unit-test and json string test 2013-12-17 16:50:48 -06:00
Connor Tumbleson
f887709823 unused import removal 2013-11-23 08:37:20 -06:00
Connor Tumbleson
e91790e676 correctly handle incorrect type labeled <array>'s 2013-11-23 08:34:33 -06:00
Connor Tumbleson
6d5d889c27 adjust spacing in test files, removed unused imports 2013-11-15 13:08:27 -06:00
Connor Tumbleson
d2fc74d984 remove jre7 code from testing class, added comments for manifest changing 2013-11-15 13:07:07 -06:00
Connor Tumbleson
1de4525534 add HelloWorld test smali file into unit-test 2013-08-12 12:27:25 -05:00
Connor Tumbleson
102cc0443d fixed unit-test to properly detect if decode worked 2013-07-15 12:24:07 -05:00
Connor Tumbleson
0919fe5322 move unit test to @beforeClass and test its output as a separate test, due to parallel test running 2013-07-08 13:24:33 -05:00
Connor Tumbleson
9f03d7d35c removes hacky @*android fix
Updates unit-tests to actually use AOSP drawables/layouts/anims, instead of using 3rd party ones.
2013-06-05 12:36:24 -05:00
Ryszard Wiśniewski
38de56697a Properly handle style with dot in its name and without a parent style. 2013-06-05 18:45:17 +02:00
Connor Tumbleson
ed67a3d94d updated unit testing
-- styles.xml
-- layouts.xml
-- anims.xml
-- drawables.xml
-- attrs.xml
-- raw/blank_test.png
2013-05-12 07:21:13 -05:00
Connor Tumbleson
aa20036307 fixed problem with <items> showing up in colors.xml 2013-05-12 07:20:35 -05:00
Ryszard Wiśniewski
d9cac893f9 Now one non positional substitution and one positional is detected as "multiple non positional". 2013-05-11 20:04:12 +02:00
Ryszard Wiśniewski
e7ee8cb178 Decode "%d %" with formatted="false". It's not necessary for current aapt, but it's more consistent with "%d % ". 2013-05-11 20:04:12 +02:00
Connor Tumbleson
997df5cfc5 added more plurals/color unit tests 2013-05-11 12:50:59 -05:00
Connor Tumbleson
acc83919d0 add "/libs" unit testing, adjusted naming on previous unit tests 2013-05-09 22:13:00 -05:00
Connor Tumbleson
3a6d548756 fixed problem with nodpi, added drawable unit testing 2013-05-09 21:54:03 -05:00
Connor Tumbleson
f93a312308 Prevents double escaping of special chars in arrays.xml/<item> tags 2013-05-05 08:13:32 -05:00
Connor Tumbleson
a7236053bf add unit-test and support for handling unknown files 2013-05-03 19:16:34 -05:00
Connor Tumbleson
8b182cacae usage redo fixed #403 2013-03-20 21:36:20 -05:00
M1cha
3578010262 add support for automatically patch signatures
Conflicts:
	brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
2013-03-19 12:55:44 -05:00
Connor Tumbleson
e4d506ab27 removed --original 2013-03-19 08:52:24 -05:00
Connor Tumbleson
e82c0754de Code cleanup of 2013
Signed-off-by: Connor Tumbleson <connor.tumbleson@gmail.com>
2013-02-12 21:12:17 -06:00
Connor Tumbleson
5a4ffe6ca0 fixed BuildAndDecodeTest, Thanks aspack 2013-01-18 06:39:48 -06:00
Connor Tumbleson
0673c1e2dc Fixes issue #395 - checks for aapt during build 2013-01-17 10:01:19 -06:00
Connor Tumbleson
f82b2e1855 fixes issue #67 - only compresses resources.arsc if original apk had compressoin 2013-01-13 08:19:42 -06:00
Connor Tumbleson
3b1a8be980 Updated unit-tests for 4.2 APK support, added -a / --apt during build for location to aapt, reverted fix regarding <uses-sdk> 2012-12-23 15:13:01 -06:00
Connor Tumbleson
dd881e21d1 unify smali/baksmali/apktool properties into one folder 2012-09-20 19:28:24 -05:00
Connor Tumbleson
4db49ab347 Adding brut.apktool :/ 2012-09-19 20:27:35 -05:00