Commit Graph

851 Commits

Author SHA1 Message Date
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
f9f59bff22 Merge branch 'jhornber-master' 2015-03-03 15:42:57 -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 "<" gets replaced with "&" in plural strings 2015-03-03 15:38:35 -06:00
Connor Tumbleson
bd566f2670 Merge branch 'thuxnder-performance' 2015-03-01 10:30:07 -06:00
thuxnder
07b43d687c use BufferedInputStream for APK
faster xml escape function
2015-03-01 10:29:34 -06:00
Connor Tumbleson
ea38c65e82 beab30089c
- update remaining reference to Proguard 5.2
2015-02-28 07:40:48 -06:00
Connor Tumbleson
3736ecef32 Merge pull request #102 from iBotPeaches/proguard5.2
update proguard to handle java8
2015-02-27 08:48:43 -06:00
Connor Tumbleson
beab30089c update proguard to handle java8 2015-02-26 15:40:27 -06:00
Connor Tumbleson
f8d153ce08 [skip] update changes for bcp47 merge 2015-02-25 16:57:52 -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
Connor Tumbleson
a062adcc0c Merge branch 'Furniel-master' 2015-02-24 06:58:18 -06:00
Connor Tumbleson
18ed4ecc9e [skip] add changelog note about .spi copying raw 2015-02-24 06:57:42 -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
1788ca061b version bump (RC4) 2015-02-12 15:42:46 -06:00
Connor Tumbleson
f089edd2d6 Merge pull request #99 from iBotPeaches/refactor_framework
Handles unreadable $HOME gracefully
2015-02-12 08:24:30 -06:00
Connor Tumbleson
3f571bebef Handles unreadable $HOME gracefully
- superseeds PR 98 (rscarvalho)
2015-02-12 08:18:53 -06:00
Connor Tumbleson
18790b92e5 Downloads gradle dependencies over https
- fixes issue 757
2015-02-10 15:47:23 -06:00
Connor Tumbleson
2590521b33 fix all cherry-picks dumping files in wrong location 2015-01-21 08:10:42 -06:00
Connor Tumbleson
8c41023b33 [skip] update changes to smali/baksmali 2.0.5 2015-01-21 07:44:24 -06:00
Ben Gruver
604e326412 Bump version number to 2.0.5
Conflicts:
	build.gradle
2015-01-21 07:43:36 -06:00
Ben Gruver
2312848efc Make ClassFileNameHandler thread-safe 2015-01-21 07:42:30 -06:00
Ben Gruver
d9e5b0a487 Switch the default for implicit references 2015-01-21 07:42:18 -06:00
Ben Gruver
97c52167cf Add stringtemplate dependency to smali, because proguard.
Conflicts:
	build.gradle
2015-01-21 07:42:02 -06:00
Ben Gruver
59a0d2f09b Refactor ClassFileNameHandler
This makes the logic quite a bit easier to follow, and fixes an issue
with the previous implementatation, where it didn't correctly handle
the case when were multiple long names that collided after being
shortened

Conflicts:
	brut.apktool.smali/util/src/main/java/ds/tree/DuplicateKeyException.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTree.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTreeImpl.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTreeNode.java
	brut.apktool.smali/util/src/main/java/ds/tree/Visitor.java
	brut.apktool.smali/util/src/main/java/ds/tree/VisitorImpl.java
2015-01-21 07:40:52 -06:00
Jeff Smith
12107ecde8 No need to reevaluate 'resource != null' 2015-01-21 07:39:34 -06:00
Jeff Smith
f5765d37c8 Give comment-generating functions more precise naming 2015-01-21 07:39:20 -06:00
Jeff Smith
a4d5d2299b baksmali: Write comments about possible floating-point values
Conflicts:
	brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java
2015-01-21 07:39:11 -06:00
Connor Tumbleson
5afd6f5e69 [skip] adjust path to match apktool structure 2015-01-21 07:33:51 -06:00
Ben Gruver
52482802dc Make the checkPackagePrivateAccess functionality an option
This is only needed for 4.2.0, but not 4.2.1. Both are api 17, so we can't
tie this functionality to an api level.
2015-01-21 07:30:19 -06:00
Connor Tumbleson
89e6b06521 Implement dex entry for non classes.dex files
Conflicts:
	brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java
2015-01-21 07:29:57 -06:00
Ben Gruver
6b6c2c09b6 Fix some generics issues when compiling with java 8 2015-01-21 07:27:17 -06:00
Ben Gruver
07ceb4fc8a Disable doclint for java 8
Conflicts:
	build.gradle
2015-01-21 07:26:53 -06:00
Ben Gruver
026d353fc7 Fix some javadoc issues 2015-01-21 07:25:12 -06:00
Ben Gruver
0153548c30 Expose the various fixed-size item counts in DexBackedDexFile 2015-01-21 07:24:58 -06:00
Ben Gruver
853da5a172 Refactor VariableSizeLookaheadIterator
Previously, when referencing instance fields from readNextItem,
the fields wouldn't have been initialized yet on the first call to
readNextItem
2015-01-21 07:24:47 -06:00
yyjdelete
3d3db44773 Use options.checkPackagePrivateAccess 2015-01-21 07:24:35 -06:00
yyjdelete
b2cf6b1d32 checkPackagePrivateAccess only for API 17(4.2)
Google revert this for compatibility.
see 7284c78e14 for details.

BTW, it seems that is also disabled for late 4.2
2015-01-21 07:24:24 -06:00
Ben Gruver
959133cbf0 Add some additional checks related to instruction size 2015-01-21 07:24:08 -06:00
edwardxwu
fe42130f05 Fixed the bug of not setting the location field of the instruction in addInstruction(i,instruction) method 2015-01-21 07:23:41 -06:00
Ben Gruver
1d597910e2 Improve the readability of the newline normalization stuff for tests 2015-01-21 07:22:40 -06:00
Ben Gruver
5388ed57ba Fix potential NPE in MethodAnalyzer 2015-01-21 07:22:27 -06:00
Ben Gruver
1b0a917a6a Implement implicit method/field references in baksmali 2015-01-21 07:21:57 -06:00
Ben Gruver
2772be8e9d Implement implicit method/field references in smali 2015-01-21 07:21:37 -06:00