From 132eeaedf7d0980397fbdac41e1a7aebff01adbf Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Tue, 5 Mar 2013 23:53:14 -0800
Subject: [PATCH] Add back various methods removed during the refactoring

---
 .../dexlib2/dexbacked/DexBackedDexFile.java   |  2 ++
 .../dexlib2/dexbacked/raw/ClassDefItem.java   | 22 +++++++++++++++++++
 .../jf/dexlib2/dexbacked/raw/FieldIdItem.java | 14 ++++++++++++
 .../jf/dexlib2/dexbacked/raw/HeaderItem.java  | 13 ++++++++---
 .../dexlib2/dexbacked/raw/MethodIdItem.java   | 14 ++++++++++++
 .../jf/dexlib2/dexbacked/raw/ProtoIdItem.java | 14 ++++++++++++
 .../jf/dexlib2/dexbacked/raw/RawDexFile.java  |  5 +++++
 .../dexlib2/dexbacked/raw/StringIdItem.java   | 14 ++++++++++++
 .../jf/dexlib2/dexbacked/raw/TypeIdItem.java  | 14 ++++++++++++
 9 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
index 5ebceef8..54b5be9a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedDexFile.java
@@ -54,6 +54,7 @@ public abstract class DexBackedDexFile extends BaseDexBuffer implements DexFile
     public abstract int getMethodIdItemOffset(int methodIndex);
     public abstract int getProtoIdItemOffset(int protoIndex);
     public abstract int getFieldIdItemOffset(int fieldIndex);
+    public abstract int getClassDefItemOffset(int classIndex);
 
     @Override @Nonnull public abstract DexReader readerAt(int offset);
 
@@ -178,6 +179,7 @@ public abstract class DexBackedDexFile extends BaseDexBuffer implements DexFile
             return protoStartOffset + protoIndex*ProtoIdItem.ITEM_SIZE;
         }
 
+        @Override
         public int getClassDefItemOffset(int classIndex) {
             if (classIndex < 0 || classIndex >= classCount) {
                 throw new ExceptionWithContext("Class index out of bounds: %d", classIndex);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDefItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDefItem.java
index 06fa2053..08981ff5 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDefItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDefItem.java
@@ -33,6 +33,7 @@ package org.jf.dexlib2.dexbacked.raw;
 
 import com.google.common.base.Joiner;
 import org.jf.dexlib2.AccessFlags;
+import org.jf.dexlib2.dexbacked.DexBackedDexFile;
 import org.jf.dexlib2.dexbacked.raw.util.DexAnnotator;
 import org.jf.dexlib2.util.AnnotatedBytes;
 
@@ -115,4 +116,25 @@ public class ClassDefItem {
             }
         };
     }
+
+    @Nonnull
+    public static String asString(@Nonnull DexBackedDexFile dexFile, int classIndex) {
+        int offset = dexFile.getClassDefItemOffset(classIndex);
+        int typeIndex = dexFile.readSmallUint(offset + CLASS_OFFSET);
+        return dexFile.getType(typeIndex);
+    }
+
+    public static String[] getClasses(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.CLASS_DEF_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int classCount = mapItem.getItemCount();
+        String[] ret = new String[classCount];
+        for (int i=0; i<classCount; i++) {
+            ret[i] = asString(dexFile, i);
+        }
+        return ret;
+    }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/FieldIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/FieldIdItem.java
index 62bc7580..a1b1dd7e 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/FieldIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/FieldIdItem.java
@@ -91,4 +91,18 @@ public class FieldIdItem {
         }
         return String.format("field_id_item[%d]", fieldIndex);
     }
+
+    public static String[] getFields(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.FIELD_ID_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int fieldCount = mapItem.getItemCount();
+        String[] ret = new String[fieldCount];
+        for (int i=0; i<fieldCount; i++) {
+            ret[i] = asString(dexFile, i);
+        }
+        return ret;
+    }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
index 5acaa7ce..5e1f05f8 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
@@ -31,7 +31,6 @@
 
 package org.jf.dexlib2.dexbacked.raw;
 
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
 import org.jf.dexlib2.dexbacked.raw.util.DexAnnotator;
 import org.jf.dexlib2.util.AnnotatedBytes;
 import org.jf.util.StringUtils;
@@ -78,12 +77,20 @@ public class HeaderItem {
     public static final int CLASS_COUNT_OFFSET = 96;
     public static final int CLASS_START_OFFSET = 100;
 
-    @Nonnull private DexBackedDexFile dexFile;
+    @Nonnull private RawDexFile dexFile;
 
-    public HeaderItem(@Nonnull DexBackedDexFile dexFile) {
+    public HeaderItem(@Nonnull RawDexFile dexFile) {
         this.dexFile = dexFile;
     }
 
+    public int getChecksum() {
+        return dexFile.readSmallUint(CHECKSUM_OFFSET);
+    }
+
+    @Nonnull public byte[] getSignature() {
+        return dexFile.readByteRange(SIGNATURE_OFFSET, SIGNATURE_SIZE);
+    }
+
     public int getMapOffset() {
         return dexFile.readSmallUint(MAP_OFFSET);
     }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodIdItem.java
index c6279070..7a12aabb 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/MethodIdItem.java
@@ -91,4 +91,18 @@ public class MethodIdItem {
         }
         return String.format("method_id_item[%d]", methodIndex);
     }
+
+    public static String[] getMethods(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.METHOD_ID_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int methodCount = mapItem.getItemCount();
+        String[] ret = new String[methodCount];
+        for (int i=0; i<methodCount; i++) {
+            ret[i] = asString(dexFile, i);
+        }
+        return ret;
+    }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ProtoIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ProtoIdItem.java
index ca3e776b..e6c7fe10 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ProtoIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ProtoIdItem.java
@@ -94,4 +94,18 @@ public class ProtoIdItem {
 
         return sb.toString();
     }
+
+    public static String[] getProtos(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.PROTO_ID_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int protoCount = mapItem.getItemCount();
+        String[] ret = new String[protoCount];
+        for (int i=0; i<protoCount; i++) {
+            ret[i] = asString(dexFile, i);
+        }
+        return ret;
+    }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/RawDexFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/RawDexFile.java
index 3cbbeb4a..546cf9e5 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/RawDexFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/RawDexFile.java
@@ -40,6 +40,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Arrays;
 import java.util.List;
 
 public class RawDexFile extends DexBackedDexFile.Impl {
@@ -55,6 +56,10 @@ public class RawDexFile extends DexBackedDexFile.Impl {
         this.headerItem = new HeaderItem(this);
     }
 
+    public byte[] readByteRange(int start, int length) {
+        return Arrays.copyOfRange(getBuf(), start, start+length);
+    }
+
     public int getMapOffset() {
         return headerItem.getMapOffset();
     }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
index 9c52abb8..23199729 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
@@ -101,4 +101,18 @@ public class StringIdItem {
         }
         return getReferenceAnnotation(dexFile, stringIndex, quote);
     }
+
+    public static String[] getStrings(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.STRING_ID_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int stringCount = mapItem.getItemCount();
+        String[] ret = new String[stringCount];
+        for (int i=0; i<stringCount; i++) {
+            ret[i] = dexFile.getString(i);
+        }
+        return ret;
+    }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
index 3e3e309c..d38c44b4 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
@@ -74,4 +74,18 @@ public class TypeIdItem {
         }
         return getReferenceAnnotation(dexFile, typeIndex);
     }
+
+    public static String[] getTypes(@Nonnull RawDexFile dexFile) {
+        MapItem mapItem = dexFile.getMapItemForSection(ItemType.TYPE_ID_ITEM);
+        if (mapItem == null) {
+            return new String[0];
+        }
+
+        int typeCount = mapItem.getItemCount();
+        String[] ret = new String[typeCount];
+        for (int i=0; i<typeCount; i++) {
+            ret[i] = dexFile.getType(i);
+        }
+        return ret;
+    }
 }