From af32d4da3e3de2525cf405baeb0e4a971696dc8a Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Fri, 21 Jun 2013 07:54:11 -0500
Subject: [PATCH] decode sources after resources

---
 .../main/java/brut/androlib/ApkDecoder.java   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index c848ddbd..a39e6dd6 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -81,20 +81,6 @@ public class ApkDecoder {
         }
         outDir.mkdirs();
 
-        if (hasSources()) {
-            switch (mDecodeSources) {
-            case DECODE_SOURCES_NONE:
-                mAndrolib.decodeSourcesRaw(mApkFile, outDir, mDebug);
-                break;
-            case DECODE_SOURCES_SMALI:
-                mAndrolib.decodeSourcesSmali(mApkFile, outDir, mDebug, mDebugLinePrefix, mBakDeb);
-                break;
-            case DECODE_SOURCES_JAVA:
-                mAndrolib.decodeSourcesJava(mApkFile, outDir, mDebug);
-                break;
-            }
-        }
-
         if (hasResources()) {
             setAnalysisMode(mAnalysisMode, true);
             // read the resources.arsc checking for STORED vs DEFLATE
@@ -133,6 +119,20 @@ public class ApkDecoder {
             }
         }
 
+        if (hasSources()) {
+            switch (mDecodeSources) {
+                case DECODE_SOURCES_NONE:
+                    mAndrolib.decodeSourcesRaw(mApkFile, outDir, mDebug);
+                    break;
+                case DECODE_SOURCES_SMALI:
+                    mAndrolib.decodeSourcesSmali(mApkFile, outDir, mDebug, mDebugLinePrefix, mBakDeb);
+                    break;
+                case DECODE_SOURCES_JAVA:
+                    mAndrolib.decodeSourcesJava(mApkFile, outDir, mDebug);
+                    break;
+            }
+        }
+
         mAndrolib.decodeRawFiles(mApkFile, outDir);
         mAndrolib.decodeUnknownFiles(mApkFile, outDir, mResTable);
         mAndrolib.writeOriginalFiles(mApkFile, outDir);