ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-11-11 06:59:24 +01:00
Code Issues Projects Releases Wiki Activity
1,927 Commits 1 Branch 0 Tags 312 MiB
775f1dbff3
Commit Graph

610 Commits

Author SHA1 Message Date
Connor Tumbleson
d1857102dd Add spaces where missing to make logic easier to read 
- refs: no issue
 2018-02-08 15:14:19 -05:00
Connor Tumbleson
bca474272e Support for rebuilding root depth kotlin folder 
- refs: #1703
 2018-02-07 09:42:56 -05:00
Connor Tumbleson
7d22fc66b5 Initial testing of private namespace 
- added sample (removed attribute names)
 2017-12-14 10:55:35 -05:00
Connor Tumbleson
b525f235f8 code style cleanup 2017-12-08 16:38:31 -05:00
Connor Tumbleson
a0cd772205 Remove duplicate manifest-only parameter 2017-12-08 16:31:25 -05:00
Nic Allen
88eed24625 Patch APKTool to allow repeated entry offsets to appear 2017-12-07 15:38:25 -08:00
Ruben Anagua
dd81dbfc9c Add ability to force decoding of manifest 2017-12-07 11:33:04 +00:00
Connor Tumbleson
2b9728e9f3 Prevent ugly "Content is not allowed in prolog" warning 
- fixes: #1634
 2017-12-01 15:21:47 -05:00
Connor Tumbleson
3264f142cb
Remove useless null warning 2017-11-29 07:56:24 -05:00
Matt Insko
5e1a47a827 Treat fonts as raw data, fixes #1662 2017-11-16 09:35:16 -05:00
Connor Tumbleson
c23c1303dd Merge branch 'master' into issue-1639 2017-10-24 15:39:28 -04:00
Connor Tumbleson
0271e55370
Fix regression when --frame-path points to non existing directory 
- fixes #1639
 2017-10-14 12:36:54 -04:00
Connor Tumbleson
41018a81b8
Remove .exit() falls from library code 
- fixes #1640
 2017-10-14 12:36:07 -04:00
Connor Tumbleson
3ec4f360ab
Add support for shorthand SDK for bounding check 
- fixes #1630
 2017-09-28 08:23:02 -04:00
Connor Tumbleson
bc00cce9bd Add support for 4 non-positional attributes 
- adds tests
 - fixes #1611
 2017-09-19 17:02:42 -04:00
Connor Tumbleson
f0f87c844e Adds ability to skip asset files 
- fixes #1605
 - prevents rebuild
 2017-09-19 15:51:04 -04:00
Connor Tumbleson
dc33533d76 add tests, make public method 2017-09-19 15:09:25 -04:00
Connor Tumbleson
21e9dd514c cs cleanup 2017-09-19 14:42:14 -04:00
Jan Vidar Krey
5f0d53ba20 Support bounding targetSdkVersion between minSdkVersion and maxSdkVersion 
It is possible to create a an AndroidStudio project that uses the following
nonsense settings:

    defaultConfig {
        minSdkVersion 15
        maxSdkVersion 19
        targetSdkVersion 25
    }

The application is successfully built by Android Studio, and the APK
works when installed on the relevant devices, however the app cannot
be re-built with Apktool afterwards.

This patch works around the problem by explicitly setting the
targetSdkVersion to the max of the maxSdkVersion and min of the minSdkVersion
only if these are specified.
 2017-09-15 16:24:39 +02:00
Connor Tumbleson
1c33fba646
close reader as well if syntax error 2017-08-27 09:57:32 -04:00
Connor Tumbleson
d6e676c583
Merge branch 'patch-1' of https://github.com/footpatch/Apktool into footpatch-patch-1 2017-08-27 09:56:39 -04:00
Connor Tumbleson
78a80d14b0 Merge pull request #1601 from xpirt/master 
fix potential class cast exceptions
 2017-08-27 09:55:13 -04:00
Connor Tumbleson
e9618fae6b
Windows binary is still 32 bit 2017-08-27 09:54:36 -04:00
Andrei Conache
9abaa4ee30 fix potential class cast exceptions 
- fixes #1444
 2017-08-27 15:23:08 +02:00
footpatch
1fddb05b71 Close input stream in SmaliMod.java 2017-08-25 20:47:31 +02:00
Connor Tumbleson
fa966d2d66 Drop 32 bit binaries 
- update unix/win/mac 64 bit binaries
 - fixes #1598
 - refs #1594
 2017-08-24 15:53:52 -04:00
Connor Tumbleson
0f4cfcb892 Tweak colorimetry to colorMode 2017-08-23 17:03:51 -04:00
Connor Tumbleson
68a7eb7a74 example applications (sparse & not) tests 
- update ARSCDecoder to detail sparse applications
 2017-08-23 14:43:57 -04:00
Connor Tumbleson
6473611d47 Initial work for Sparsed Resource Types 
- die out if encountered
 2017-08-23 14:14:48 -04:00
Connor Tumbleson
bf44f9b809 Support for Color HDR & Gamut 2017-08-23 13:53:30 -04:00
Connor Tumbleson
eee73b945d Support for VRHeadset Qualifier 2017-08-23 13:05:08 -04:00
Connor Tumbleson
79454823b3 Refactor directory checks to prevent assumptions 
- only checks directory path of apktool framework location
 - fixes #1586
 2017-08-15 15:52:46 -04:00
Connor Tumbleson
f9c091f54b refactor sdk codename to sdk level into function 2017-08-15 15:35:26 -04:00
Connor Tumbleson
15bc16c6bd
Survive decoder if malformed string is encountered 
- fixes #1564
 2017-07-27 06:55:18 -04:00
Connor Tumbleson
eda95b3da2 Don't read more data than entryChunk has 
- fixes #1534
 2017-07-26 16:21:59 -04:00
Connor Tumbleson
dbb144f9af Throw nasty warnings if JAXP 1.5 support isn't present 
- JAXP 1.5 allows us to check for XML XXE/OOB malicious tricks
 - Fixes #1553
 2017-07-17 14:12:14 -04:00
Connor Tumbleson
34b4cfd515 Merge branch 'master' into master 2017-07-12 14:45:53 -04:00
Marc Miltenberger
5359ac0ef5 Make sure to close the file after reading in. The parse(File) method does not close the file under all circumstances. 2017-07-12 20:16:00 +02:00
Connor Tumbleson
2bd10a7d9f
Internalize constants to not rely on JDKs 2017-07-08 14:20:26 -04:00
Connor Tumbleson
3bbab052c4 spelling fix 2017-07-06 10:15:44 -04:00
Connor Tumbleson
1c23bb3962 remove duplicate code in favor of function 2017-07-05 15:44:10 -04:00
Connor Tumbleson
657a44f593 Stop DOCTYPE decl dead in the tracks 2017-07-05 15:36:54 -04:00
Connor Tumbleson
02c8b62b00 Prevent malicious directory/file work with unknown files 2017-07-05 12:45:17 -04:00
Connor Tumbleson
1597c12472 changed all license files 2017-07-05 12:05:52 -04:00
Connor Tumbleson
93d61cc07a kotlin folder should not be treated as unknown - #1520 2017-07-04 09:55:50 -04:00
Bing Qiao
28883538a7 Class.class.getResourceAsStream tries to load resource from root directory. This fails when apktool is built into a fat jar like Spring boot executable so that the classloader tries to load the resource from the root directory of the Spring boot jar instead of that of the bundled appktool jar. 2017-06-29 12:36:05 +01:00
Connor Tumbleson
40ece96a1a remove shorthand if statement syntax 2017-06-28 10:09:15 -04:00
Marc Miltenberger
5d383e4a62 Basically, on import getResSpec is called multiple times and very often throws an exception. Returning null is much faster and therefore in cases where the caller does not rely on a thrown exception, it may use the new getResSpecUnsafe method. 2017-06-28 11:24:40 +02:00
Connor Tumbleson
dab59a2aec
Adding a few random AOSP 9 patch images to more test suite more robust. 2017-06-09 08:20:41 -04:00
Connor Tumbleson
4a3e24666e code style cleanup 2017-06-08 16:51:28 -04:00
Connor Tumbleson
bd62f7e3e5 Merge branch 'fix-optical-inset' of https://github.com/phhusson/Apktool into phhusson-fix-optical-inset 2017-06-08 15:52:14 -04:00
Connor Tumbleson
f19317d87c
Prevent doctypes declarations 2017-05-27 15:12:54 -04:00
Pierre-Hugues HUSSON
2a35125441 Merge branch 'master' into fix-optical-inset 2017-05-26 10:07:29 +02:00
Connor Tumbleson
a00da345b2
code style cleanup 2017-05-25 07:02:23 -04:00
Connor Tumbleson
d2e16044bd
Merge branch 'fix-grayalpha-9patch' of https://github.com/phhusson/Apktool into phhusson-fix-grayalpha-9patch 2017-05-25 07:00:00 -04:00
Connor Tumbleson
15c4f333a5
Correctly decode arrays.xml 
- #1453
 - temporarily cast unknown enum (0) to ResArray
 2017-05-24 08:09:05 -04:00
Connor Tumbleson
d979247794
patches for style decoding 2017-05-23 09:27:27 -04:00
Pierre-Hugues Husson
60f32f7365 Decode OpticalInset cf #1511 2017-05-22 22:28:10 +02:00
Pierre-Hugues Husson
dd32f9414d In case of a grayscale + alpha 9patch, work-around JDK. 
Original code:
https://worldwind31.arc.nasa.gov/svn/trunk/WorldWind/src/gov/nasa/worldwind/util/gdal/GDALUtils.java
/JDK-5051418
Cf Bug #1508
 2017-05-20 13:49:40 +02:00
Connor Tumbleson
390ecae6c5
Handle strings with style index at end of string 2017-05-19 09:28:44 -04:00
Connor Tumbleson
e1f7ac355e
add support for preview builds (N, O) 2017-05-08 09:03:13 -04:00
Connor Tumbleson
b09dce4050
Prevent loading styles if style position is outside of string 
- fixes #1453
 2017-05-08 09:03:13 -04:00
Connor Tumbleson
e723e6e68f
Prevent over escaping plurals item tags 2017-05-08 08:34:17 -04:00
Connor Tumbleson
429e18ac25
Move MXSerializer to unique namespace 
- prevents dependency version from loading
 - patch MXSerializer to skip duplicate namespaces at same depth
 2017-05-08 08:33:49 -04:00
Connor Tumbleson
90b7d4b9b5
move common output to fine LOG level 
- only visible in VERBOSE
 2017-05-05 07:51:24 -04:00
Connor Tumbleson
e2f77aac18
Pass exception back to user 
- check object is not null before closing
 - refs #1160
 2017-05-05 07:46:56 -04:00
Connor Tumbleson
e4db1fa8d6 Prevent closing objects that may not exist. 2017-05-04 17:53:54 -04:00
Connor Tumbleson
488b9d58dd
code style changes 2017-05-02 08:16:07 -04:00
Marc Miltenberger
66c1b46865 Closing Framework and APK after use 
This commit should fix https://github.com/iBotPeaches/Apktool/issues/1160
 2017-05-02 08:21:09 +02:00
Connor Tumbleson
2d5337d3cb
Keep baksmali options same as previous apktool 2017-04-25 08:42:01 -04:00
Alexei Khlebnikov
0fa6418553 fix of binary xml string length encoding, now supporting long resource strings 2017-04-04 17:19:21 +02:00
Connor Tumbleson
74f76ae71d
Upgrade to smali 2.2 2017-03-27 09:16:11 -04:00
Peter M
c3fc2fe260 show message about null references 2017-01-13 16:49:58 +03:00
Connor Tumbleson
b60db0917d
Add support for 3 non-positional attributes 
- fixes #1360 & fixes #1405
 - add tests
 2017-01-13 07:06:38 -05:00
Connor Tumbleson
6e86fa9fcd retain backward compatibility w/ old ExtFile extended to new location 2016-12-26 07:37:54 -05:00
Connor Tumbleson
891d0d39e0 Refactor ExtFile to brut.j.dir 
- move to using Paths when possible
 - adapt calls to FileDirectory to leverage Paths
 2016-12-25 07:57:41 -05:00
Connor Tumbleson
166bf508e2 Add "--no-version-vectors" 
- fixes #1384
 - prevents aapt versioning vectors on rebuild
 2016-12-23 09:11:43 -05:00
Connor Tumbleson
31d015fe37 Add new aapt binaries for macosx 2016-12-23 07:30:46 -05:00
Connor Tumbleson
dae52d3899
Add new aapt binaries 
- 32/64 unix
 - windows
 2016-12-22 09:06:25 -05:00
Andrei Conache
983e0ad111 fix TYPE_DYNAMIC_ATTRIBUTE support 2016-12-20 14:09:10 +01:00
Connor Tumbleson
c1cb9425d5 Don't write out a null spec 
- #1370
 2016-12-02 15:32:31 -05:00
Connor Tumbleson
6361fa9725
Evolve Update-Framework to Empty Framework Directory 
- allows emptying of framework via (empty-framework-dir)
 - checks in place to only delete files that are APKs, non recursive
 2016-10-06 09:18:16 -04:00
Connor Tumbleson
daa1e1d753
Updating Framework Support 2016-10-06 07:21:10 -04:00
Connor Tumbleson
81b22df13c Merge pull request #1324 from jamestut/arscfix2 
Skip additional payload data of TYPE chunk
 2016-09-18 16:56:23 -04:00
Connor Tumbleson
c1b4e0d321
Merge branch 'smali-api-level' of https://github.com/benjamin-promon/Apktool into benjamin-promon-smali-api-level 2016-09-18 16:47:04 -04:00
jamestut
52a44776df Skip additional payload data of TYPE chunk 
Some APKs' arsc has additional payload data (like TYPE 8 chunks and/or padding) in the TYPE chunk. After the ARSCDecoder read such kind of chunk, it acts erratically. Most of the time, it just stops parsing the ARSC, therefore, some resources are not decoded because they are not in the apktool's resources' spec table.
 2016-09-18 00:13:19 +07:00
Connor Tumbleson
bdfc28c20f
add support for TYPE_DYNAMIC_ATTRIBUTE 2016-09-15 08:36:25 -04:00
Benjamin Adolphi
db35f54af6 Pass minimum api level to smali library 
When apktool creates a DexBuilder class, it creates it without specifying a minimum api level. This causes the DexBuilder class to assume api level 20 by default. This is not ideal since in some cases, the concrete minimum api level is required.

One such case is in smali's DexWriter class which implements a workaround for a bug in Dalvik that was fixed in Android 4.2 (https://code.google.com/p/android/issues/detail?id=35304) that causes apps that call the Method.getParameterAnnotations api to crash in some cases (see bug report for more details). The workaround that smali implements is only triggered if the minimum api level is below 17 (Android 4.2). But since apktool effectively sets the minimum api level to 20, this code is never triggered causing apktool to create apk files that crash on devices below Android 4.2.

This change passes the minimum api level to the smali library.
 2016-09-15 00:31:32 +02:00
Connor Tumbleson
7801a4bbf2
don't compress mkv/webm 2016-08-24 08:44:24 -04:00
Connor Tumbleson
67d80a133f
Ignore the unknown 4 bytes in Android N 2016-08-24 07:56:09 -04:00
Connor Tumbleson
00abedfa06
Check for null parent references to prevent crash 
- fixes #745
 2016-08-06 12:46:45 -04:00
Connor Tumbleson
bada6441ec
don't edit the original Manifest 
- use dummy copy and restore original after build
 2016-08-06 09:45:18 -04:00
Connor Tumbleson
d0baa841eb
Add support for getting literal values for references in android:scheme 
- side affect of using public.xml to get constant resource ids
 - fixes #1097
 2016-08-06 08:31:58 -04:00
Connor Tumbleson
567907b187
Create fake names to prevent abuse from duplicate key names 
- fixes #894
 2016-08-06 07:57:19 -04:00
Connor Tumbleson
6e509695eb
Patch newest AndroResGuard format 2016-08-06 07:56:17 -04:00
Anthony Morris
e23eb9cf6b Use Guava's LittleEndianDataInputStream. 
This replaces the custom LittleEndianDataInputStream with
guava's implementation. To do this, I had to fix ExtDataInput
to better handle the case where skipBytes doesn't skip all the
bytes (the tests failed without this, and succeed with it). This
appears to be the main difference between the two implementations.
Guava's implementation is preferred because it is already a
dependency and because its license is clearer (the previous
implementation had a vague "public domain" comment in the thread
which may not be legally sufficient).

Fixes #1166
 2016-08-05 14:36:34 +01:00
Connor Tumbleson
2135ad3057
Prevent truncation of hex values in AndroidManifest 
- fixes #972
 2016-08-02 22:48:02 -04:00
Connor Tumbleson
e6faa56c96
Correctly handle ResTable_typeSpec by using unsigned bytes to prevent overflow 
- fixes #1185
 - allows applications that have large typeSpec indexes to work
 2016-08-01 23:26:00 -04:00
Connor Tumbleson
3a982948ea
Adds full filepath for STORED files in case of multiple extensions 
- fixes #1244
 - prevents greedy extension check STORE`ing too many files
 2016-07-29 09:21:52 -04:00
Connor Tumbleson
475178605c
dump header size during failure 2016-07-21 08:29:06 -04:00
Connor Tumbleson
ed7b094b02
move default framework location on windows/unix 
- unix - $HOME/.local/share/apktool
 - windows - $HOME/AppData/Local/apktool
 - #1277
 2016-06-21 08:03:00 -04:00
Connor Tumbleson
a684bae43a
Fixes improper decoding of @empty value 
- fixes #1270
 - references #1116
 2016-06-13 08:40:00 -04:00
Pierre-Hugues Husson
606e47bf55
Add @empty type 2016-06-13 08:23:08 -04:00
Connor Tumbleson
c389139434
Handles APKs with missing versionCode/versionName properties 
- fixes #1264
 2016-06-08 07:24:27 -04:00
Connor Tumbleson
d932c70cbe
Forces extensions to lowercase to prevent collisions 
- references #1258
 2016-05-31 07:34:46 -04:00
Connor Tumbleson
47dd120b38 Prevents package renaming of Adobe AIR applications 
- fixes #1240
 2016-05-04 08:04:28 -04:00
Connor Tumbleson
ba62238843 Skips unknown bytes if mismatch occurs after reading Configurations 
- fixes #1131
 2016-04-30 09:02:23 -04:00
Sunil Shivanand
7c1ce8bb6e Issue 1234 - Use literal value of versionName when used 
When reference string is used for versionName in AndroidManifest.xml,
fetch the literal value of the referened string in the output apk.

This patch doesnt modify the original apk.
 2016-04-28 16:25:42 +02:00
Connor Tumbleson
87315af36e Remove previous android:debuggable value to allow changing 
- adds unit test
 - normalizeNewlines moved to TestUtils
 2016-04-28 08:31:36 -04:00
Benjamin Dobell
032a3e5e25 Reinstate minimalistic debug option to inject android:debuggable with aapt 2016-04-28 08:21:21 -04:00
Connor Tumbleson
8689991626 clear /apktool/framework/1.apk in between tests 2016-04-27 07:37:14 -04:00
Andrei Zhukouski
513e4b752b Copy AndroidManifest.xml 
Copy AndroidManifest.xml along with resources.arsc from the framework apk file instead of creating the fake entry.
 2016-04-22 08:32:42 +03:00
Andrei Zhukouski
2ec2fe817a Fix typo 2016-04-17 15:02:38 +03:00
Andrei Zhukouski
6e065f15a0 Support of official aapt 
Create fake AndroidManifest.xml file inside each installed framework file to support official aapt from Google.
 2016-04-17 14:48:51 +03:00
Connor Tumbleson
639ac84edb Dont fallback to HighestResSpec Package if only 1 main package 
- fixes #1220
 2016-04-11 07:05:00 -04:00
Connor Tumbleson
f2f099a97b Merge branch 'master' of https://github.com/mattsarett/Apktool into mattsarett-master 2016-03-24 08:14:32 -04:00
Chirayu Desai
26b60364fb Replace little endian data input stream implementation 
* Drop LEDataInputStream (which had a restrictive license)
  with LittleEndianDataInputStream, which is public domain.

A minor change has been made to the new class, removing
the interitance of InputStream.
This makes it's behaviour indentical to the previous implementation,
and unit tests pass.

Fixes #1166
Source: http://www.peterfranza.com/2008/09/26/little-endian-input-stream/
 2016-03-23 19:58:16 +05:30
Connor Tumbleson
ea2c821fa5 Add support for AndResGuard 
- fixes #1170
 2016-03-10 09:29:49 -05:00
Connor Tumbleson
ee8e9cea3d cleanup from removal of smali-debugging 2016-03-10 09:29:05 -05:00
Dave Nault
2f1326c6ca #1186 Performance: usage of String.format in ARSCDecoder.addMissingResSpecs 
Reduces the time it takes to parse the Android framework by ~50%.

The synthesized name now has no leading zeroes, but this doesn't appear to matter since the numeric part of the name isn't used anywhere.
 2016-03-07 11:33:07 -08:00
Matt Sarett
4f5cc1b903 Removing spaces 2016-03-04 11:27:19 -05:00
Matt Sarett
ae6f8083f1 Fix bug reencoding 9patch pngs 
Fixes issue 1180.
https://github.com/iBotPeaches/Apktool/issues/1180
 2016-03-03 18:17:11 -05:00
Connor Tumbleson
eabedeb211 remove unused file 2016-02-27 20:56:14 -05:00
Connor Tumbleson
cd852cd658 Removes SmaliDebugging 
- fixes #1061
 2016-02-27 20:20:53 -05:00
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
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
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
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
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
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
a29839bab2 Added API 23 qualifier "roundness" 2015-10-08 06:58:11 -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
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
14589e3593 If passed string isn't a reference, don't look for it. 2015-04-19 07:44:57 -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
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
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
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
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
c91ef3822e [skip] code style updates 2014-12-25 12:21:30 -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
ad70082ebf fix placement of lollipop natural qualifier check 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
50de34bbf1 add anydpi qualifier 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
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
Jeff Smith
db2478a71f Handle ResStringValue when ResAttr expected in ResStyleValue 2014-10-18 23:40:04 -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
584d1cda18 ignore "com.lge.internal" 2014-05-18 06:48:01 -05:00