Commit Graph

1173 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
Connor Tumbleson
8525be6fab Merge pull request #1147 from BurgerZ/patch-4
Hacky fix FileNotFoundException if file name ends with space
2016-01-26 07:21:43 -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
114af9799d Merge branch 'rover12421-yaml-object' 2016-01-22 07:17:16 -06: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
a64a031f4f Merge pull request #1126 from BurgerZ/patch-3
Write output to separate streams (error and output)
2016-01-06 12:50:44 -06:00
Connor Tumbleson
2b2441b405 Merge branch 'BurgerZ-patch-2' 2016-01-06 12:50:13 -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
74e0aa0bd2 Write output to separate streams (error and output)
This will allow to write errors and output to the console handler as usual, but will help to handle errors from external binaries (such as aapt, executed by exec method) in all initialized logger handlers, not only console, but text handler, for ex.
2016-01-05 10:39:07 +03:00
Andrei Zhukouski
22bd5b0acc Fixes issue #1122 2016-01-04 13:15:54 +03:00
Connor Tumbleson
47076ebaba start new dev cycle (2.1.0-SNAPSHOT)
- including previous commit :)
2016-01-03 17:52:32 -06:00
Connor Tumbleson
06a96d035d Merge pull request #1120 from ihanson/encode
Consistently encode unknown filenames to prevent cast error
2016-01-03 17:49:54 -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
9402bd90ec version bump (2.0.3) 2015-12-31 06:03:09 -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
237283c01d cache travis deps & allow failure for openjdk while travis fixes it 2015-12-18 11:52:08 -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
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
Connor Tumbleson
0649d5a638 remove stillmaintained badge (site is dead) 2015-11-30 16:23:15 -06:00
Connor Tumbleson
b0eb58a426 Merge pull request #1084 from rover12421/readConfigFlags_read_setDeafultValue_28
set readConfigFlags read default value to 28
2015-11-17 08:52:14 -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
Connor Tumbleson
a4b5c926f4 fixes #1056
- removes unneeded echo
2015-10-29 07:09:45 -05:00
Connor Tumbleson
9ca830e8a1 Merge pull request #1073 from CzBiX/google_code_url
update url of Google Code to GitHub
2015-10-24 05:49:34 -05: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
Connor Tumbleson
ed35a9f72f switch from ssh to https 2015-10-19 17:47:29 -05:00
Connor Tumbleson
183eefc737 Merge pull request #1064 from zoujunhua86/master
add "flyme" to list of ignored renamed packages
2015-10-16 19:04:39 -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