From 0dd2f3f6ba3b37d9c19e86261987d3db14fff217 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 19 Jan 2013 12:10:07 -0600 Subject: [PATCH] Revert to c836995ead80bc13e10627e1939f153b2faefc6e --- .../res/data/value/ResStyleValue.java | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java index 5b060a06..b6ce42a9 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java @@ -50,25 +50,12 @@ public class ResStyleValue extends ResBagValue implements ResValuesXmlSerializab for (int i = 0; i < mItems.length; i++) { ResResSpec spec = mItems[i].m1.getReferent(); - // fix for ClassCastException by Alsan Wong at 2013/01/18 15:08 - ResAttr attr = null; - String value = null; - - try { - // hacky-fix remove bad ReferenceVars - ResValue attrValue = spec.getDefaultResource().getValue(); - value = attrValue.toString(); // I know, this is not good, but I don't want another variable just for exception handling - - if(true == value.contains("ResReferenceValue@")) { - continue; - } - - attr = (ResAttr)attrValue; - value = attr.convertToResXmlFormat(mItems[i].m2); - } catch(ClassCastException e) { - System.out.println("ClassCastException: " + e.getMessage()); - System.out.println(value); - } + // hacky-fix remove bad ReferenceVars + if (spec.getDefaultResource().getValue().toString().contains("ResReferenceValue@")) { + continue; + } + ResAttr attr = (ResAttr) spec.getDefaultResource().getValue(); + String value = attr.convertToResXmlFormat(mItems[i].m2); if (value == null) { value = mItems[i].m2.encodeAsResXmlValue();