Connor Tumbleson
4219997470
update internal aapt to include various patches
...
- miui support for godzillaui
- miui support for 4 digit mnc/mcc
- no-op the compat functions
2015-08-15 10:20:05 -05:00
Andrew Grieve
392420c909
Adds doNotCompress list to apktool.yml
...
This is the list of files (resources, assets, etc) that are stored in
the .apk uncompressed.
For apps that use AssetFileDescriptor.openFd(), the adding compression
will break the call.
Maintains support for the resourcesAreCompressed key, but no longer
records it when decompiling (it instead records resources.arsc in the
doNotCompress list).
2015-08-14 11:52:33 -04:00
Connor Tumbleson
2033e305af
Prevent reading resources when -r / --no-res is used
2015-08-11 13:47:10 -05:00
Connor Tumbleson
099cc0fcb3
fixes #1005
...
- handles apks that have .9.xml files
2015-08-03 08:45:30 -05:00
Matt Mastracci
4249dde7cc
Propagate the raw int values to callers
2015-07-07 15:39:22 -06:00
Connor Tumbleson
d5f3b3fd5a
[skip] its com.miui.core now
2015-06-29 11:33:13 -05:00
Connor Tumbleson
b878cbd776
[miui] add a new ignored package
2015-06-06 10:43:48 -05:00
Connor Tumbleson
6ee029dd30
Read extra data if over known bytes
...
If the ResConfig had a size over KNOWN_CONFIG_BYTES
then the remaining bytes would be read twice, thus breaking
the next config. Fixes #924
2015-05-22 09:07:15 -05:00
Connor Tumbleson
2c1226fab8
[skip] use append instead of concat
2015-05-22 08:47:51 -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
9cb3df85d8
Catch attr lookup on internal attributes
...
Internal attributes will fail the AttrDecoder. Catch the errors
and simply return the undecoded value which will be correct. Fixes #913
2015-05-10 07:36:44 -05:00
Connor Tumbleson
48285bde03
Prevent frameworks from modifying sharedLibrary
...
Since all frameworks are decoded the same via readPackage(), reading
a framework that was a sharedLibrary would throw the sharedLibrary
flag for the apk. Since packageName isn't set until after the first
decode, we check the values to make sure we only set this variable on
the first apk decoded. Refs #936
2015-05-05 07:43:48 -05:00
Connor Tumbleson
1fb87e3e4c
Post smali 2.0.6 cleanup
...
- fix smaliDecoder/AccessorTest to use new DexFileFactory params
- remove unneeded ds/tree files
- cleanup unmerged lines
2015-05-02 06:59:36 -05:00
Connor Tumbleson
c659df9dce
Correctly add version qualifier when decoding
...
- fixes #928
2015-04-29 07:49:02 -05:00
Connor Tumbleson
e407fe839b
Correctly rebuild /libs & /lib folder on [b]uild
2015-04-22 07:21: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
14589e3593
If passed string isn't a reference, don't look for it.
2015-04-19 07:44:57 -05:00
Connor Tumbleson
5d405fa842
add a unit-test for provider attr changing
2015-04-18 08:44:25 -05:00
Connor Tumbleson
3208624bf6
Moves all XML parsing related functions to new class: ResXmlPatcher
2015-04-16 08:24:30 -05:00
Connor Tumbleson
addbf8336d
[WIP] Wires up rewriter of @string references in provider attrs
...
- finds all <providers> in manifest
- finds corresponding @string in res/values/strings.xml
- does reference replacement w/ literal value
- fixes #636
2015-04-16 08:24:30 -05:00
Connor Tumbleson
becaf754a9
[skip] use IOUtils.closeQuietly()
2015-04-16 08:20:18 -05:00
Connor Tumbleson
3cdd8243c7
Read res header completely
2015-04-16 08:14:57 -05:00
Connor Tumbleson
7326867b09
re-add copy() method using try-with-resources
2015-04-16 08:12:20 -05:00
Connor Tumbleson
10afb3cd56
Merge branch 'del_BrutIO_copy' of https://github.com/rover12421/Apktool into rover12421-del_BrutIO_copy
2015-04-16 08:03:44 -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
a561a95542
Don't ignore multiple dex files when -s is used
...
- fixes #904
2015-04-04 08:09:07 -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
Rover12421
407ffdc5fe
remove BrutIO copy method
...
`copy` method already in IOUtils
2015-03-30 13:30:52 +08:00
Greg Leach
39a2848340
Moving a couple utility functions into BrutIO. Also, formatting change to match spec.
2015-03-25 09:56:55 -07:00
Greg Leach
472a02db41
Formatting for right-hand margin
2015-03-24 20:22:05 -07: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
Rover12421
f3582b60db
buildUnknownFiles optimization
...
newFileSystem will file replication overhead
2015-03-18 09:15:26 +08: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
a766db9d50
update internal aapt to API 22
2015-03-12 17:44:22 -05:00
Connor Tumbleson
697de20454
update internal framework to API 22 (lollipop mr1)
2015-03-12 17:44:07 -05:00
Connor Tumbleson
40e75a0a39
[skip] sdk version (lollipop mr1)
2015-03-12 17:43:47 -05:00
Connor Tumbleson
2db8828efb
add support for TYPE_NULL
2015-03-12 17:43:17 -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
thuxnder
07b43d687c
use BufferedInputStream for APK
...
faster xml escape function
2015-03-01 10:29:34 -06:00
Connor Tumbleson
4638c06de4
Merge pull request #100 from iBotPeaches/bcp47-support
...
[WIP] Initial support for BCP47 tags
2015-02-25 16:46:22 -06:00
Furniel
ddb4f9770d
SPI are not 9patches
...
- skip these by copying raw
2015-02-24 12:36:43 +02: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
da347b22ba
[skip] remove unused import
2015-02-19 11:37:51 -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
db38c217ae
Update ResConfigFlags for BCP
...
- renamed country to region to match AOSP
- added support for values-xxx-rXX
- added support for BCP47
- default to BCP47 for values-xxx
2015-02-19 09:06:08 -06:00
Connor Tumbleson
d40710005f
Handle BCP additional fields (script & variant)
...
layoutDirection was being read in error. layoutDirection is read
via bit shifting over screenLayout (byte 32, 33)
The then removed layoutDirection freed up 2 bytes. This gave us
12 bytes of unknown space from byte 36 to 48. This corresponded
to localeScript[4] and localeVariant[8]
Adding proper support for those bytes fixed BCP support
2015-02-19 09:05:00 -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
3f571bebef
Handles unreadable $HOME gracefully
...
- superseeds PR 98 (rscarvalho)
2015-02-12 08:18:53 -06:00
Connor Tumbleson
81e6af093b
Removes general access bit hack
...
- fixed in aosp: android_libcore/commit/25681be69e19a834b00cfbf54cd99ac13f12b9ff
- reverts 42f69fd745
- reverts 47a5eac0b0
- fixes googlecode issue 744
2015-01-21 07:12:26 -06:00
Connor Tumbleson
e281f81546
[skip] during info message, don't show apk build dir
2015-01-19 07:25:21 -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
c91ef3822e
[skip] code style updates
2014-12-25 12:21:30 -06:00
Connor Tumbleson
5dfa79934c
[tests] adds tests for shared resources & framework tagging
2014-12-25 12:21:12 -06:00
Connor Tumbleson
e9d21f84af
Handle apks that utilize Shared Resources
...
- shared resource is currently hardcoded to pkgId 2 like AOSP
- merry christmas
2014-12-25 09:56:25 -06:00
Connor Tumbleson
2bd1e595df
update internal aapt to API 21 (patched)
...
- removes implicit adding of version qualifiers (v4, v7, v13, v21)
2014-12-17 18:08:41 -06:00
Connor Tumbleson
ad70082ebf
fix placement of lollipop natural qualifier check
2014-11-21 11:26:18 -06:00
Connor Tumbleson
cd21bd37a8
[tests] add tests for lollipop (API 21)
2014-11-21 11:26:18 -06:00
Connor Tumbleson
0150835bb0
Add support for BCP-47
...
- Switch to BCP-47 was to move away from hideous java locale toString
- mnc1 padded to mnc01
- mnc10 padded to mnc010
2014-11-21 11:26:17 -06:00
Connor Tumbleson
554591a339
added support for TYPE_DYNAMIC_REFERENCE
2014-11-21 11:26:17 -06:00
Connor Tumbleson
fb67c0cd15
update internal aapt to API 21
2014-11-21 11:26:17 -06:00
Connor Tumbleson
e1a0b9eb8f
[tests] add test for watch (api 20)
2014-11-21 11:26:16 -06:00
Connor Tumbleson
50de34bbf1
add anydpi qualifier
2014-11-21 11:26:16 -06:00
Connor Tumbleson
e08e76152c
update internal framework to API 21 (lollipop)
2014-11-21 11:26:16 -06:00
Connor Tumbleson
daafeb284e
fixes regression introduced in 40fdfc50a1
...
- tagged framework support fixed
2014-11-21 11:25:07 -06:00
Connor Tumbleson
e8dae927d4
Merge pull request #95 from iBotPeaches/cleanup_options
...
Options Cleanup
2014-11-02 07:48:36 -06:00
Connor Tumbleson
9b1c7d22ef
JEB - Fix decompressor when string arrays aren't 4-byte aligned
2014-11-01 21:21:35 -05: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
a7d8ca9086
cs fixes, remove unused imports
2014-10-29 16:18:47 -05:00
Connor Tumbleson
d821717253
java7 try-with-resources and multi catch
2014-10-29 16:18:25 -05:00
Connor Tumbleson
9031c22365
[skip] update all copyrights to 2014
2014-10-23 18:14:48 -05:00
Connor Tumbleson
aba540885e
Gradle Refresh
...
- move common functions to functions.gradle
- use dependency aliases whenever possible
- update to gradle 2.1
- cleanup build.gradle files with proper spacing
- remove duplicated blocks
- compile incrementally (java)
Gradle Refresh v2
- alphabetical order dependencies
- added jdk8 to build tests
- moved script to file for travis
Gradle Refresh v2a
- fix travis
- remove pointless logging
jdk8 isn't ready for travis
2014-10-23 17:43:37 -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
3e6fc8c5ef
QMG are not 9patches
...
- skip these by copying raw
2014-10-22 21:56:54 -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
Jeff Smith
db2478a71f
Handle ResStringValue when ResAttr expected in ResStyleValue
2014-10-18 23:40:04 -05:00
Connor Tumbleson
5bc76f197f
update internal framework to API 21 (lollipop)
2014-10-17 13:37:19 -05:00
Connor Tumbleson
99c1ab96da
add api 21 qualifiers
...
- watch
- tiny cs fixes
- tag MIUI related changes
2014-10-17 13:35:02 -05:00
Connor Tumbleson
06bcff5b6f
[skip] update changelog, code style fixes
2014-10-05 12:35:03 -05:00
Connor Tumbleson
62db52fe7b
Handle APKs with NULL padding on StringPools
...
- issue 664
2014-10-05 12:34:38 -05:00
Connor Tumbleson
76bf5ead25
Handle renamed manifests with "yi"
...
- issue 682
2014-10-05 12:33:47 -05:00
Connor Tumbleson
ce3c37c6ab
Handle ARSC files with multiple ResPackages
...
- superseeds - 68c1809a48
2014-10-03 11:31:43 -05:00
Connor Tumbleson
6138d26335
prevent execution if file is named same as apktool framework folder
2014-09-23 08:32:04 -05:00
Connor Tumbleson
7b0ba28a43
[skip] code style
2014-09-23 08:24:45 -05:00
Connor Tumbleson
49b6bf70e4
[skip] check result of .setExecutable()
2014-09-23 07:56:28 -05:00
Connor Tumbleson
ce15b50c1c
handles <string-array> / <array> that require formatted="false" attributes
2014-09-22 18:27:25 -05:00
Connor Tumbleson
3d2e935f08
[skip] cs fixes
2014-08-16 10:17:15 -05:00
Connor Tumbleson
56c953cd16
don't break BC, store classes.dex in /smali
2014-08-16 09:54:34 -05:00
Connor Tumbleson
b2b5eb5f01
[skip] cs fixes, added changes to changelog
2014-08-16 09:48:02 -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
7ef993cc75
Multiple Dex Support - part 3
...
- dexlib2 handles non classes.dex
- cleaned up functions
- cs fixes
2014-08-16 08:45:43 -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