From cc8c2cee0bdd6e0971a4f3813f0c27dbc4460ea0 Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Wed, 5 Aug 2009 05:50:11 +0000 Subject: [PATCH] Use the .getBytes(String) form git-svn-id: https://smali.googlecode.com/svn/trunk@365 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- .../main/java/org/jf/dexlib/HeaderItem.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java index 14b1b81b..e750970e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java @@ -31,7 +31,7 @@ package org.jf.dexlib; import org.jf.dexlib.Util.AnnotatedOutput; import org.jf.dexlib.Util.Input; -import java.nio.charset.Charset; +import java.io.UnsupportedEncodingException; public class HeaderItem extends Item { /** @@ -57,7 +57,13 @@ public class HeaderItem extends Item { /** {@inheritDoc} */ protected void readItem(Input in, ReadContext readContext) { - byte[] expectedMagic = MAGIC.getBytes(Charset.forName("US-ASCII")); + byte[] expectedMagic; + try { + expectedMagic = MAGIC.getBytes("US-ASCII"); + } catch (UnsupportedEncodingException ex) { + throw new RuntimeException(ex); + } + byte[] readMagic = in.readBytes(8); for (int i=0; i<8; i++) { @@ -165,7 +171,14 @@ public class HeaderItem extends Item { out.annotate(4, "data_off"); } - out.write(MAGIC.getBytes(Charset.forName("US-ASCII"))); + byte[] magic; + try { + magic = MAGIC.getBytes("US-ASCII"); + } catch (UnsupportedEncodingException ex) { + throw new RuntimeException(ex); + } + + out.write(magic); out.writeInt(0); //checksum out.write(new byte[20]); //signature out.writeInt(dexFile.getFileSize());