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
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
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
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
Connor Tumbleson
6a87c9ffd4
remove un-needed done.
2013-07-08 13:58:46 -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
6b173146ac
fix invalid casting
2013-07-08 12:27:55 -05:00
Connor Tumbleson
63b0dd1edb
fixes JDK bug: 5051418
2013-07-08 12:27:33 -05:00
Connor Tumbleson
6fdf7b37e1
b3: added fixed windows aapt
2013-06-24 14:23:39 -05:00
Connor Tumbleson
65be443e05
regression: fix decoding a jar file.
2013-06-14 13:44:48 -05:00
Connor Tumbleson
6475ef8a77
ignore errors during Manifest alterations, to prevent crashing of apktool
2013-06-12 10:29:16 -05:00
Connor Tumbleson
832978a549
fixes issue 469, added -m / --match-original
...
fixes xml output not having newline after xml declaration
2013-06-12 10:04:28 -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
Connor Tumbleson
a4a22a2961
revert commit: 7d5d633b97
2013-06-05 11:58:17 -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
09a978e015
fix for root unknown file on windows
2013-05-24 08:11:10 -05:00
Connor Tumbleson
cfac52a744
fix for Windows Env using FileSystem, thanks @BurgerZ
2013-05-24 07:55:33 -05:00
Connor Tumbleson
c6861e1241
move multi catches to multi-catch (java 7), fixed pkg id not being correctly read from apktool.yml
2013-05-12 10:15:36 -05: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
Connor Tumbleson
ac745599ed
close, unclosed ZipFile
2013-05-12 07:20:07 -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
14f26474e6
Cleaned up the code related to multiple substitutions in xml strings.
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
Ryszard Wiśniewski
68f97980eb
ResXmlEncoders: replaced findNonPositionedSubstitutions() by more flexible findSubstitutions().
...
Also rewritten some bits.
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
9186858f33
added lib support for "/libs" folder.
2013-05-10 08:24:24 -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
Ryszard Wiśniewski
89133557ca
Added debugLinePrefix CLI option.
2013-05-04 22:04:26 +02:00
Connor Tumbleson
0b37a23874
remove old imports, update changes to reflect fixing of smali debug
2013-05-03 19:30:30 -05:00
Connor Tumbleson
a7236053bf
add unit-test and support for handling unknown files
2013-05-03 19:16:34 -05:00
Ryszard Wiśniewski
150a95f14a
Fixed "b -d" if there are .parameter directives with defined names (e.g.: .parameter "foo")
2013-05-03 14:08:59 -05:00
Connor Tumbleson
ae5e292b1f
Merge branch 'wip-2.0' of git://github.com/brutall/brut.apktool into brutall-wip-2.0
2013-05-02 12:56:46 -05:00
Connor Tumbleson
be73563c43
handle all version(s) as strings, and change java to 1.7
2013-05-02 12:56:18 -05:00
Ryszard Wiśniewski
fba0918b80
Now adding line breakpoints when debugging should be easier in Eclipse, Netbeans and IDEA.
2013-05-02 17:49:30 +02:00