style: correct syntax for custom attributes

Author: iBotPeaches

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java

@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -343,15 +344,19 @@ public String getAttributeName(int index) {
         if (value == null || value.length() == 0) {
             try {
                 value = mAttrDecoder.decodeManifestAttr(getAttributeNameResource(index));
-                if (value == null) value = "";
-            } catch (AndrolibException e) {value = "";}
+                if (value == null) {
+                    value = "";
+                }
+            } catch (AndrolibException e) {
+                value = "";
+            }
         } else if (! namespace.equals(android_ns)) {
             try {
                 String obfuscatedName = mAttrDecoder.decodeManifestAttr(getAttributeNameResource(index));
                 if (! (obfuscatedName == null || obfuscatedName.equals(value))) {
                     value = obfuscatedName;
                 }
-            } catch (AndrolibException e) {}
+            } catch (AndrolibException ignored) {}
         }
         return value;
     }
@@ -387,10 +392,9 @@ public String getAttributeValue(int index) {
 
         if (mAttrDecoder != null) {
             try {
-                String value = valueRaw == -1 ? null : ResXmlEncoders
-                        .escapeXmlChars(m_strings.getString(valueRaw));
-                String obfuscatedValue = mAttrDecoder
-                        .decodeManifestAttr(valueData);
+                String value = valueRaw == -1 ? null : ResXmlEncoders.escapeXmlChars(m_strings.getString(valueRaw));
+                String obfuscatedValue = mAttrDecoder.decodeManifestAttr(valueData);
+
                 if (! (value == null || obfuscatedValue == null)) {
                     int slashPos = value.lastIndexOf("/");
 
@@ -404,10 +408,11 @@ public String getAttributeValue(int index) {
                 }
 
                 return mAttrDecoder.decode(
-                        valueType,
-                        valueData,
-                        value,
-                        getAttributeNameResource(index));
+                    valueType,
+                    valueData,
+                    value,
+                    getAttributeNameResource(index)
+                );
             } catch (AndrolibException ex) {
                 setFirstError(ex);
                 LOGGER.log(Level.WARNING, String.format("Could not decode attr value, using undecoded value "

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java

@@ -53,18 +53,20 @@ public String decodeManifestAttr(int attrResId)
 
             // See also: brut.androlib.res.data.ResTable.getResSpec
             if (attrId >> 24 == 0) {
-                ResPackage pkg =  getCurrentPackage();
+                ResPackage pkg = getCurrentPackage();
                 int packageId = pkg.getId();
                 int pkgId = (packageId == 0 ? 2 : packageId);
                 attrId = (0xFF000000 & (pkgId << 24)) | attrId;
             }
 
-            // Retrieve the ResSpec in a package by its id
+            // Retrieve the ResSpec in a package by id
             ResID resId = new ResID(attrId);
             ResPackage pkg = getCurrentPackage();
             if (pkg.hasResSpec(resId)) {
                 ResResSpec resResSpec = pkg.getResSpec(resId);
-                if (resResSpec != null) {return resResSpec.getName();}
+                if (resResSpec != null) {
+                    return resResSpec.getName();
+                }
             }
         }