Commit Graph

582 Commits

Author SHA1 Message Date
Connor Tumbleson
52e9e8a4d7 fix spacing & change warning message to use LOGGER 2016-02-16 08:18:26 -05:00
Christopher R. Palmer
4a02f5321c decoder: Extend "keep-broken-res" to also ignore duplicate resources 2016-02-15 11:13:49 -05:00
Connor Tumbleson
b29df52b87 Cleanup unclosed streams plus formatting
- run FindBugs to find problems
2016-02-14 20:34:06 -05:00
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
Andrei Zhukouski
ce66e17ee0 Hacky fix FileNotFoundException if file name ends with space (issue #1145) 2016-01-26 11:02:19 +03:00
Connor Tumbleson
fd579747a8 license additions and reverting non-needed changes 2016-01-22 07:17:07 -06: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
81404c8904 close streams that needed closing (fixes #1143) 2016-01-22 06:27:23 -06:00
Connor Tumbleson
d5ca4c12a1 fix #1123
- correctly handles @null in xml
 - added unit test
2016-01-22 06:07:49 -06:00
Connor Tumbleson
0011498b52 [skip] rename var to match extension or file without extension 2016-01-06 12:49:55 -06:00
Andrei Zhukouski
22bd5b0acc Fixes issue #1122 2016-01-04 13:15:54 +03: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
13b39903d2 empty or null values should not be matched 2015-12-26 06:59:57 -05:00
Connor Tumbleson
f9323943db Handle Dexguard key names
- Temporarily replace with dummy value names till research is completed
 - allows decode
2015-12-26 06:59:43 -05:00
Connor Tumbleson
a8a9c40a7b add ResBoolValue to Style check 2015-12-26 06:58:39 -05: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
e5ac340cab [ci skip] minor spacing change 2015-12-18 09:46:28 -06:00
Connor Tumbleson
831765665f Handling empty (null) values again 2015-12-14 11:35:15 -06:00
Connor Tumbleson
b2d50bec5f [skip] code style cleanup 2015-12-14 07:10:14 -06:00
Connor Tumbleson
eabb7d819b Correctly read sparse ResourceTables.
Prior to this change, APKs usually went Package -> TypeSpec -> Config (all) -> Entries.
Reading all configs under that TypeSpec. Now we have packages that go
Package -> TypeSpec -> Config (single) -> Entries.

So we have to read this correctly to make sure we can correctly decode sparse and packed
Resource tables.
2015-12-14 07:03:09 -06:00
Connor Tumbleson
7e803aeac9 Gracefully handle null values 2015-12-14 07:00:46 -06:00
Connor Tumbleson
be4bdf1d75 Adds support for DATA_NULL_EMPTY 2015-12-14 07:00:12 -06:00
Connor Tumbleson
6c4167fba4 Fixes #1099
- Moves Config --> Type
 - Moves Type -> TypeSpec
 - ResType -> ResTypeSpec
 - ResConfig -> ResType

 This is to match AOSP and ease the transitions/updates of new AOSP drops
2015-12-07 20:48:57 -06:00
Connor Tumbleson
1e5dc3006e Add headerSize & chunkSize to Header class 2015-12-07 07:34:56 -06:00
Connor Tumbleson
af2f54245b [skip] remove confusing logic 2015-12-03 07:57:12 -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
Rover12421
6f617db53f set readConfigFlags read default value to 28
fix if size == 28, remainingSize error.
2015-11-17 14:31:17 +08:00
Connor Tumbleson
5f5f50f6fd Fixes edge case where mnc = 1, with no mcc field. Fixes #1072 2015-11-01 06:17:29 -06:00
CzBiX
7b116d974f update url of Google Code to GitHub 2015-10-24 15:36:00 +08:00
Connor Tumbleson
83f3273a48 Merge branch 'master' of github.com:iBotPeaches/Apktool 2015-10-20 06:27:09 -05:00
Connor Tumbleson
3cc141025f Add deprecation notice for SmaliDebugging - #1061 2015-10-20 06:19:50 -05:00
zoujunhua
c30261bd15 add "flyme" to list of ignored renamed packages 2015-10-16 16:02:02 +08:00
Connor Tumbleson
8fee3499e3 add unit-test for #1063 2015-10-15 10:52:01 -05:00
Connor Tumbleson
3dea579f66 Prevent casting Strings/Styles to Attrs
- refs #957, #1060
2015-10-15 08:58:19 -05:00
Connor Tumbleson
76a940628f greedy .dex finder is finding dex files in unknown folders
- which android can't load unless its in /root of apk
2015-10-15 08:57:20 -05:00
Connor Tumbleson
5e4bae0526 Only stores extension(s) of uncompressed files
- fixes #1053
2015-10-13 07:28:43 -05:00
Connor Tumbleson
0fb21a3758 update internal aapt to API 23 2015-10-12 06:21:25 -05:00
Connor Tumbleson
b54e40ad21 update internal framework to API 23 (marshmallow) 2015-10-08 06:59:05 -05:00
Connor Tumbleson
26b883ac3b Updated unit-tests to include API 23 tests 2015-10-08 06:58:32 -05:00
Connor Tumbleson
a29839bab2 Added API 23 qualifier "roundness" 2015-10-08 06:58:11 -05:00
Connor Tumbleson
0d53923e24 Merge branch 'fix-flag-ref' of https://github.com/phhusson/Apktool into phhusson-fix-flag-ref 2015-09-12 15:07:49 -05:00
Connor Tumbleson
52dc52c2d3 add failing unit-test for reference in attribute 2015-09-12 15:07:32 -05:00
Pierre-Hugues Husson
e7b294a3ea Fix flags being defined as references 2015-09-10 18:07:00 +02:00
Connor Tumbleson
e8ad159438 Some APKs are reporting wrong pkgId
- fallback to renamed package to find that pkgId
2015-08-21 11:01:43 -05:00
Connor Tumbleson
579d7c561e fixes #1021
- adds support for godzillaui
2015-08-15 10:29:24 -05:00
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
0003d56389 Switch to Proguard Gradle 2015-05-01 10:26:10 -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
7f487daaf2 [skip] put new github page project url 2015-04-05 10:21:50 -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
2f7ae8c001 [meta] Repo Cleanup
- Moved all license files to root
 - Moved NOTICE to CONTRIBUTORS.md
 - cleaned up .gitignore
 - removed redundant gitignores
2015-03-14 08:02:57 -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 "&lt;" gets replaced with "&amp;" 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
Connor Tumbleson
70eaab9971 Multiple Dex Support
- CS fixes
 - added decode support for multiple dexes
 - decoded to smali_[dex name]
2014-08-15 20:24:12 -05:00
Connor Tumbleson
04d3d1a03a [skip] remove newline at EOF 2014-06-18 11:06:05 -05:00
Connor Tumbleson
2ca606c04d Merge branch 'master' of github.com:teprrr/Apktool into teprrr-master 2014-06-18 11:01:20 -05:00
Connor Tumbleson
e126a51b4b handles manifests with missing named attributes.
- fixes #512
2014-06-18 10:59:54 -05:00
Teemu Rytilahti
5eabf19157 Allow using the library externally by catching the exceptions while loading properties from unavailable classes. 2014-06-18 00:53:53 +02:00
Connor Tumbleson
848f0d6b5f fixed regression introduced in: b149d7bd49 2014-05-30 06:33:17 -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
0ece6cf1b3 update internal aapts for "unknown error -19" 2014-05-25 11:26:29 -05:00
Connor Tumbleson
584d1cda18 ignore "com.lge.internal" 2014-05-18 06:48:01 -05:00
Connor Tumbleson
8ad817441f suppress warnings when coming back from Yaml 2014-05-12 17:12:04 -05:00
Connor Tumbleson
a3897bfe0d [spelling] Nul -> Null 2014-05-12 17:11:28 -05:00
Connor Tumbleson
fc0b584af1 [skip] adjusted spacing to match new standard 2014-05-12 17:01:08 -05:00
Connor Tumbleson
0bb217ac88 [skip] code spacing 2014-05-12 17:00:49 -05:00
Connor Tumbleson
b149d7bd49 cleaned up XmlPullStreamDecoder
-- removed optimize for manifest bool
 -- take attr value once, then re-use
 -- used passed ResTable, instead of re-init
2014-05-12 17:00:31 -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
b53101f69e adds support for ignoring "com.lge"
-- fixes issue 630
2014-05-08 15:08:40 -05:00
Connor Tumbleson
dbda71d2af [skip] fix output to match a jar 2014-05-03 07:38:49 -05:00
Connor Tumbleson
a031787ece switch from URI to Paths 2014-05-03 07:37:52 -05:00
Connor Tumbleson
251a6bbb11 add unit-test for font tags in <array> item 2014-03-19 16:52:07 -05:00
Connor Tumbleson
25e9ed7281 add more modular support for renamed packages
-- There is no "set" rules for renaming a manifest, so we must adapt to patterns. There are some apks that have original package names as "android", "miui", "com.htc", etc. These are not meant for renaming, but exist to align that apk to a specific OEM framework system. (EX HTC system apks have a package id of com.htc). However, this pattern isn't true when framework apks are involved, as the intended behavior is to rename the package from xxx to com.htc (as an example).

-- We solve this by first identifying the active package via the packageId instead of package with most ResSpecs (we fall back on that though)
-- then with two hardcoded arrays of UNKNOWN_PACKAGES and ALLOWED_PACKAGES
2014-03-19 16:23:45 -05:00
Connor Tumbleson
74153661df add unit-test for jpg image 2014-03-18 10:31:07 -05:00
Connor Tumbleson
1e3b66f9be adds "miui", "android" and "com.htc" to list of ignored renamed packages. 2014-03-09 17:47:43 -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
b5dcce3738 abstracted unknown files out of resources, to remove dependencies on ResTable 2014-03-02 08:46:35 -06:00
Connor Tumbleson
0736aac013 fixes unknown files being ignored when -r is used 2014-02-22 13:59:36 -06:00
Connor Tumbleson
65b188ae96 fixes unknown files being ignored if prefixed with known file 2014-02-16 11:20:06 -06:00
Connor Tumbleson
f130c995fb added failing unit-test for bug 603 2014-02-16 11:16:59 -06:00
Connor Tumbleson
f85dc478b2 Github pr #81 - correctly handle non-URI characters in filename 2014-02-10 07:17:56 -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
94b90a6dd2 add code style doc rules, adjusting stringblock to 120 margin 2014-02-09 19:23:25 -06:00
Connor Tumbleson
086139a037 code cleanup of 2014 2014-02-09 19:01:57 -06:00
Connor Tumbleson
c5a8f0c8a5 don't write a trailing /u0000 if its the last char of the string 2014-02-09 18:49:32 -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
ca314b9aae fix abused lengths (strings over 32768) for UTF-16 strings 2014-02-09 18:48:40 -06:00
Connor Tumbleson
b1d1a0863d remove old hashed binaries during proguard build, update gradle wrapper url 2014-02-08 18:05:57 -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
e48ab8b9b9 threadsafe StringBlock 2014-02-07 07:35:03 -06:00
Connor Tumbleson
e3ed1a448a refactor gradle version system for release, snapshots and non-git snapshots 2014-02-04 09:54:00 -06:00
Connor Tumbleson
dc2b2fecb8 cleanup new lines and fixup revision properties 2014-02-04 09:52:09 -06:00
Connor Tumbleson
2af523d5d4 correctly handles apk's with one package named "android" 2014-01-13 17:43:09 -06:00
Connor Tumbleson
501a6df677 only store renamed-manifest-package if the apk requires the change 2014-01-07 15:06:45 -06:00
Connor Tumbleson
f6a61ba1b4 rename variables to help user understand, remove unneeded ones 2014-01-07 13:08:48 -06:00
Connor Tumbleson
e254cec648 rework manifest renaming
Issue #526, correctly handles apks where a renamed package is required, by comparing the package name present
in AndroidManifest.xml and resources.arsc. If different, we take the package name present
in resources.arsc (original) and replace it in the <manifest> tag of AndroidManifest.xml. The previous value in
AndroidManifest.xml (renamed) becomes the value to be passed to aapt on rebuild via --rename-manifest-package

Both these values along with the package id of the original are stored in apktool.yml, for use during the
rebuild
2014-01-07 10:59:37 -06:00
Connor Tumbleson
559a3024cc Ignore multiple types 2014-01-06 06:39:51 -06:00
Connor Tumbleson
7a162fb80f add long-string unit-tests 2013-12-18 08:41:30 -06:00
Connor Tumbleson
1d745ac0ad correctly handles abused length strings - jtmuhone 2013-12-18 08:41:18 -06:00
Connor Tumbleson
52767a2a94 add unicode string unit-test and json string test 2013-12-17 16:50:48 -06:00
Connor Tumbleson
d5d03fe1e4 cleanup confusing logic - ntop001 2013-12-09 06:23:21 -06:00
Connor Tumbleson
259ff5ef01 fix nio2 windows problem - funorpain 2013-12-08 16:48:59 -06:00
Connor Tumbleson
f887709823 unused import removal 2013-11-23 08:37:20 -06:00
Connor Tumbleson
a1ca5019d8 fix spacing in ResArrayValue 2013-11-23 08:35:08 -06:00
Connor Tumbleson
e91790e676 correctly handle incorrect type labeled <array>'s 2013-11-23 08:34:33 -06:00
Connor Tumbleson
4b180bd13c handle MNC_ZERO correctly 2013-11-22 16:22:53 -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
8d0801e6db cleanup document related functions 2013-11-15 12:08:21 -06:00
Connor Tumbleson
feb71b2aa0 code cleanup (spacing) 2013-11-05 15:38:49 -06:00
Connor Tumbleson
f6623d8a12 add newer release api versions 2013-11-03 19:08:39 -06:00
Connor Tumbleson
acd0fcd9e3 update internal aapt's to API 19 2013-11-02 11:28:59 -05:00
Connor Tumbleson
9a31c135ac update internal framework to API 19 2013-11-01 20:11:52 -05:00
Connor Tumbleson
bdb718f8a9 added xxxhdpi, added DENSITY_400, added MNC_ZERO 2013-11-01 20:10:39 -05:00
Connor Tumbleson
2ef25fe5e2 fix jar disassembling 2013-10-16 19:48:43 -05:00
Connor Tumbleson
87e39c4bb9 add todo 2013-10-12 15:44:47 -05:00
Connor Tumbleson
68c1809a48 Handles multiple package framework files correctly. 2013-10-12 15:40:06 -05:00
Connor Tumbleson
64bcb32d81 add method to return size of resPackage, (count of ResSpecs) 2013-10-12 15:39:43 -05:00
Connor Tumbleson
02ac674551 Add apktool version to output during decode/rebuild 2013-09-17 21:52:09 -05:00
Connor Tumbleson
27922bdb81 remove hardcoded seperator char 2013-09-17 21:48:31 -05:00
Connor Tumbleson
bd9dce78b4 add warning for unknown operating system and fix getFrameworkDir to use non hardcode seperator char 2013-09-17 21:44:57 -05:00
Connor Tumbleson
0e33e2d477 update to use FileDataStore 2013-09-15 10:35:00 -05:00
Connor Tumbleson
acd335f92d output as stdout instead of stderr 2013-09-14 12:37:49 -05:00
Connor Tumbleson
d4b86475ca fix for NPE w/ null version numbers 2013-09-12 17:46:14 -05:00
Connor Tumbleson
be4ae922de stderr for error messages 2013-09-07 08:54:07 -05:00
Connor Tumbleson
054ddb1388 Fix for window builds due to java.nio 2013-09-07 08:53:07 -05:00
Connor Tumbleson
acea65f63a fix NPE for outputting to a folder that already exists. 2013-08-15 10:16:52 -05:00
Connor Tumbleson
c27d514a16 update internal aapts to API 18 2013-08-15 10:04:07 -05:00
Connor Tumbleson
d12468a2f7 remove "Done"/"Loaded" messages, as output is becoming clogged. 2013-08-14 08:33:09 -05:00
Connor Tumbleson
6d5fb63ee4 [skip] fix spacing 2013-08-13 15:52:03 -05:00
Connor Tumbleson
dd5723cafa remove useless check and fix SmaliBuilder to actually build debug files 2013-08-13 15:45:51 -05:00
Connor Tumbleson
f95f9b2f4b debuginjector - adapt for dexlib2 2013-08-13 15:45:15 -05:00
Connor Tumbleson
5aa18eee2d [SmaliMod] adjust handling for stream, files and dexlib2 2013-08-13 15:43:35 -05:00
Connor Tumbleson
3acff3ef34 remove DexFileBuilder, due to dexlib2 2013-08-13 08:42:27 -05:00
Connor Tumbleson
a4ac131479 [SmaliDecoder] force 1 job if debug mode 2013-08-13 08:42:04 -05:00
Connor Tumbleson
d07f52bd6a fix prop location of smali/baksmali, add more checks 2013-08-12 12:28:28 -05:00
Connor Tumbleson
a8f6e40c02 update SmaliDecoder to handle jobs / odex files 2013-08-12 12:28:01 -05:00
Connor Tumbleson
1de4525534 add HelloWorld test smali file into unit-test 2013-08-12 12:27:25 -05:00
Connor Tumbleson
743e67ac9e adapt build.gradle for new dexlib2 changes 2013-08-12 12:27:07 -05:00
Connor Tumbleson
ca67c00f83 wip 2013-08-12 09:16:51 -05:00
Connor Tumbleson
b0cee3c500 remove duplicate import 2013-08-12 09:16:51 -05:00
Connor Tumbleson
fb7fbf0805 pass api to DexFileFactory 2013-08-12 09:16:51 -05:00
Connor Tumbleson
af32d4da3e decode sources after resources 2013-08-12 09:16:51 -05:00
Connor Tumbleson
570eaa7023 adapt SmaliDecoder to dexlib2 2013-08-12 09:16:51 -05:00
Connor Tumbleson
a2c8d64d84 adjust build.gradle to handle apktool / dexlib2 2013-08-12 09:16:50 -05:00
Connor Tumbleson
007a6d45a2 Update to smali 2b5 2013-08-12 09:16:50 -05:00
Connor Tumbleson
115db91fab fixes space in filepath on windows 2013-07-26 16:36:26 -05:00
Connor Tumbleson
fbf8d8fbdf update internal framework to API 18 2013-07-25 07:52:39 -05:00
Connor Tumbleson
102cc0443d fixed unit-test to properly detect if decode worked 2013-07-15 12:24:07 -05:00