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
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
932ef75635
remove extra - from --match-original
2013-06-25 08:29:45 -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
Ryszard Wiśniewski
ed0e4eb64c
Fixed debug injection if there are annotated method parameters.
2013-05-02 17:49:30 +02:00
Ryszard Wiśniewski
fed7f763b9
Fixed "apktool b" with default app_path argument.
2013-05-02 17:49:30 +02:00
Ryszard Wiśniewski
6e7e0c0984
Fixed "-d" option of build command - it was always enabled.
2013-05-02 17:49:30 +02:00
Ryszard Wiśniewski
59da5db05f
Readded smali debugging feature.
2013-05-02 17:49:30 +02:00
Ryszard Wiśniewski
70deba0c5d
TypeName: added fromPath() and fromNameParts().
2013-05-02 17:49:30 +02:00
Connor Tumbleson
ccb76e1abb
adjust output for if|install for --frame-path
2013-05-02 07:08:14 -05:00
Connor Tumbleson
722369fbd7
set console width to 120 to allow documentation to fit perfectly
2013-05-01 21:55:33 -05:00
Connor Tumbleson
168075e493
remove dead imports
...
remove old kxml import
update snakeyaml to 1.12
2013-05-01 18:05:46 -05:00
Connor Tumbleson
db6ecadc00
fix spacing in installFramework()
2013-04-30 07:55:33 -05:00
Connor Tumbleson
d18ee186da
Update density ConfigFlags to ints, updated internal windows aapt.
2013-04-30 07:53:52 -05:00
Connor Tumbleson
47a5eac0b0
fixed install|if frameworks with commons-compress
2013-04-30 07:53:17 -05:00
Connor Tumbleson
9e50300ec2
update spacing
2013-04-07 07:37:52 -05:00
Lars Greiss
7d5d633b97
Apktool: Add new inverted TRDS qualifier
...
into awesome apktool
thanks and cheers
SlimRoms Team
2013-04-06 12:56:42 -05:00
Connor Tumbleson
069a0d5807
include updated aapt for unix and macosx
2013-04-06 12:55:51 -05:00
Connor Tumbleson
42f69fd745
fixes #439
...
Extends ZipFile using apache commons compress ZipFile, to have finer control over the header allowing some parts to be ignored,
ex: the general access bit
2013-04-06 12:50:42 -05:00
Connor Tumbleson
51013d9e0a
remove console width formatting
2013-04-03 22:57:27 -05:00
Connor Tumbleson
3a5530e67b
remove hardcoded htc stuff
2013-04-03 14:07:18 -05:00
Connor Tumbleson
9a6fd7de63
updated to isAdvanceMode() and updated spacing on file
2013-04-01 16:44:19 -05:00
Connor Tumbleson
a48c11dc1c
cleanup of various functions
...
Removed attr sorting that was never enabled and never worked, added @todo elements for unknown file handling, updated usage output
2013-04-01 16:41:27 -05:00
Connor Tumbleson
0ca74eca67
support for decoding unknown files, @todo add support for building unknown files
2013-03-31 17:13:10 -05:00
Connor Tumbleson
2e44e3a856
handle com.htc.resources correctly
2013-03-31 09:05:07 -05:00
Connor Tumbleson
4b8ed4c2b1
progress on UnknownFile handling
2013-03-31 09:04:12 -05:00
Connor Tumbleson
be77354859
only use --forced-package-id if prebuilt aapt is used
2013-03-29 14:49:04 -05:00
Connor Tumbleson
d8b774864c
fix comment on getAaptBinaryFile()
2013-03-29 14:45:54 -05:00
Connor Tumbleson
0c5871687f
fixes #440 includes prebuilt aapt binaries
2013-03-29 14:42:35 -05:00
Connor Tumbleson
90577d40e8
added OSDection, and prebuilt aapt
2013-03-28 19:51:08 -05:00
Connor Tumbleson
c5d2ecf96f
fixed #401 (versionCode / versionName)
2013-03-21 08:58:14 -05:00
Connor Tumbleson
c420a039e0
set --max-res-version if maxsdk version is present
2013-03-21 06:32:18 -05:00
Connor Tumbleson
669d6400d2
minor cosmetic changes to usage output, added publicize-resources
2013-03-21 06:12:35 -05:00
Felipe Barriga Richards
9677119324
Issue 359: Can't decompile Notif Pro 0.31 / Tested on other apk
2013-03-21 05:48:12 -05:00
Connor Tumbleson
43993551bd
updated changes, removed license from usage output
2013-03-21 05:44:58 -05:00
Connor Tumbleson
82eb3af7e7
forgot addition of --quiet and --verbose
2013-03-20 21:56:39 -05:00
Connor Tumbleson
b6afd4b580
removed unused imports in Main.java
2013-03-20 21:41:48 -05:00
Connor Tumbleson
8b182cacae
usage redo fixed #403
2013-03-20 21:36:20 -05:00
Connor Tumbleson
74493651e6
moar cli work
2013-03-20 20:37:52 -05:00
Connor Tumbleson
6757c0a79f
finished cli usage printout
2013-03-20 16:58:24 -05:00
Connor Tumbleson
dca0182339
progress on #403
2013-03-20 08:53:39 -05:00
M1cha
071ce71a61
apktool-lib: fix recompiling framework apk's with dependencies by using static package-id
2013-03-19 12:55:58 -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
69ee710e30
fixes #427 , correctly handles --frame-path
on build
2013-03-14 16:50:27 -05:00
Connor Tumbleson
ba00d532c6
add kxml2 (2.3.0)
2013-03-14 07:56:53 -05:00
Connor Tumbleson
e6cf72f1d2
Merge pull request #71 from rchiossi/master
...
Fix for Null Reference while extracting Resources.
2013-02-27 17:26:56 -08:00
Rodrigo Chiossi
bad8392487
Fix null mConfig in addMissingResSpecs()
2013-02-27 12:09:06 -03:00
Connor Tumbleson
8a9af4ab31
update known bytes to 38
2013-02-24 10:53:40 -06:00
Connor Tumbleson
626d7e7ecd
fixes #396 , update to smali v1.4.2
2013-02-16 07:32:39 -06:00
Connor Tumbleson
881bb56b4d
removing register and class path overrides
2013-02-16 06:47:17 -06: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
f504ceca43
minor comment change / cleanup
2013-02-03 11:50:31 -06:00
Connor Tumbleson
dbce4479b2
added -version to print out raw version number
2013-01-30 20:22:13 -06:00
Connor Tumbleson
39a9bf054c
actually commit previous commit
2013-01-29 21:26:08 -06:00
Connor Tumbleson
7fe733bf43
adding support for htc .r.9.png
2013-01-21 08:25:57 -06:00
Connor Tumbleson
484feea284
removing dead code, code cleanup
2013-01-19 16:35:48 -06:00
KDGDev
60f0d9848d
Optimized, not need function
2013-01-19 21:55:40 +04:00
Connor Tumbleson
c836995ead
optimizations to ApkDecoder regarding reading compression of resources.arsc
2013-01-18 14:26:14 -06:00
Connor Tumbleson
cb5bad5555
added ability to use --frame-path during install of frameworks
2013-01-18 08:19:19 -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
92eae964a9
fixes issue #394 , and changes building script to fatJar (instead of build)
2013-01-17 07:58:50 -06:00
Connor Tumbleson
bbee938b5c
deleted not-needed smali stuff, renamed license for smali to prevent conflicts, worked on Proguard
2013-01-16 21:51:04 -06:00
Connor Tumbleson
3947b4c941
cleaning up gradle build files, removing proguard
2013-01-16 19:18:32 -06:00
Connor Tumbleson
6744b2469c
gradle redo (moved each to their own project for organization)
2013-01-16 16:06:32 -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
aebdf7a519
only show -aapt info in verbose mode
2013-01-06 09:57:44 -06:00
Connor Tumbleson
e9196c28b8
output smali filename instead of filestream
2013-01-05 08:50:48 -06:00
Connor Tumbleson
2a7cf75682
ugh SpringSuite is half-commiting. Adjusting null -> "" for strings
2012-12-23 16:02:00 -06:00
Connor Tumbleson
c62f1c5f64
dont substring release build, as it pulls name directly from build.gradle
2012-12-23 15:23:12 -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
3b0ca62fb0
fix warnings related to <uses-sdk>
2012-12-23 10:10:36 -06:00
Connor Tumbleson
46bfe8b66f
new internal framework for API 17 (updated)
2012-12-23 09:24:17 -06:00
Connor Tumbleson
9d19ad1355
adding support for release / snapshot builds via gradle. kudos to #smali
2012-12-19 18:19:20 -06:00
Connor Tumbleson
559ed2853a
prevents renaming manifest if package is "android" and fixes deletion of tmp files
2012-12-19 07:57:52 -06:00
Connor Tumbleson
04b5508c3a
Android 4.2 support finally ? updated some internal libs, fixed --renamed-package
2012-12-18 19:40:42 -06:00
Connor Tumbleson
f065a5be92
properly store package information (manifest AND resources.arsc info) in apktool.yml for renamed packages
2012-12-13 21:14:41 -06:00
Connor Tumbleson
4410e466f5
Merge branch 'master' of github.com:iBotPeaches/Apktool
2012-12-01 12:37:16 -06:00
Connor Tumbleson
da68943022
Starting work on Bug #252
2012-12-01 12:36:51 -06:00
Robert Mays Jr
f83383a33b
Support for --framework <dir> command line argument to specify the location of the framework files (previously forced you to keep them in the home folder)
2012-11-29 18:30:21 -05:00
Connor Tumbleson
b4db7735a5
only check for layoutDir if over sdk 17
2012-11-19 07:56:19 -06:00
Connor Tumbleson
a7d7458ffc
Updatings links & documentation and SmaliDecoder fix
2012-11-19 07:48:15 -06:00
Connor Tumbleson
5b106e5c34
New API 17 resource identifiers. ~ Untested
...
Adjust naming to match brut.all conventions & added natural SDK check w/ new configFlags
2012-11-19 07:47:59 -06:00
Connor Tumbleson
6b31aeb7c4
Added SDK API 17 (Android 4.2) framework
2012-11-13 19:16:06 -06:00
Connor Tumbleson
1a9901a75d
updated github location and commented out --original function
2012-11-12 21:34:33 -06:00
Connor Tumbleson
5a290988bc
commenting out retaining original signature until fixed
2012-11-12 21:31:54 -06:00
Connor Tumbleson
85a4901e1d
fix useless helpers of mType variable
2012-11-03 18:33:41 -05:00
Connor Tumbleson
58ec5e1892
updating gitignore for compatibility w/ Eclipse & added fix for new MIUI
2012-11-01 14:23:19 -05:00
Zhukovskiy Andrey
ea8f6b666f
reference-array dirty fix (works)
2012-10-21 13:25:11 -05:00
Kevin C. Krinke
f9aaf2cc7e
Runtime.exec has problems dealing with spaces in arguments given. Lame resolution is to change the ~/Library/Application Support/apktool path to ~/Library/apktool. Fix is for OS X only. Do not think there is problems on other platforms with this.
2012-10-21 13:25:11 -05:00
Connor Tumbleson
689e0e59a6
updating JesusFreke's smali/baksmali. Fixed SmaliMod to handle removal of smaliLexer.
2012-10-08 18:50:34 -05:00
Connor Tumbleson
008e1004c2
fixes #45
2012-10-08 14:42:10 -05:00
Connor Tumbleson
5ab853a249
WIP - fixing corrupted frame due to gradle not copying resources
2012-09-27 21:05:50 -05:00
Ziggy
84393b100f
Fix version for build
2012-09-26 20:59:25 -04:00
Connor Tumbleson
a8a0f3c459
added backslash to fix resourceStream for embedded framework
2012-09-23 11:00:17 -05:00
Connor Tumbleson
ca623f6617
fixes #37 reverts public.xml change
2012-09-22 22:40:33 -05:00
Connor Tumbleson
18fc242bba
adding android-framework.jar fixes #34
2012-09-21 06:56:00 -05:00
Connor Tumbleson
c676ad1c60
forgot to update Properties.java lol.
2012-09-20 19:51:48 -05: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
Connor Tumbleson
60c806f2e2
Moving all REPOs into one
2012-09-19 20:19:12 -05:00