minor fixes for pull 2791

Author: erev0s

brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java

@@ -20,6 +20,7 @@
 import brut.androlib.meta.UsesFramework;
 import brut.androlib.options.BuildOptions;
 import brut.androlib.res.AndrolibResources;
+import brut.androlib.res.data.ResConfigFlags;
 import brut.androlib.res.data.ResPackage;
 import brut.androlib.res.data.ResTable;
 import brut.androlib.res.data.ResUnknownFiles;
@@ -35,6 +36,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.jf.dexlib2.iface.DexFile;
+import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -491,12 +493,13 @@ public boolean buildResourcesFull(File appDir, UsesFramework usesFramework)
                 if (buildOptions.netSecConf) {
                     MetaInfo meta = readMetaFile(new ExtFile(appDir));
                     if (meta.sdkInfo != null && meta.sdkInfo.get("targetSdkVersion") != null) {
-                        if (Integer.parseInt(meta.sdkInfo.get("targetSdkVersion")) < 24) {
+                        if (Integer.parseInt(meta.sdkInfo.get("targetSdkVersion")) < ResConfigFlags.SDK_NOUGAT) {
                             LOGGER.warning("Target SDK version is lower than 24! Network Security Configuration might be ignored!");
                         }
                     }
                     File netSecConfOrig = new File(appDir, "res/xml/network_security_config.xml");
                     if (netSecConfOrig.exists()) {
+                        LOGGER.info("Replacing existing network_security_config.xml!");
                         netSecConfOrig.delete();
                     }
                     ResXmlPatcher.modNetworkSecurityConfig(netSecConfOrig);
@@ -539,7 +542,7 @@ public boolean buildResourcesFull(File appDir, UsesFramework usesFramework)
                 apkFile.delete();
             }
             return true;
-        } catch (IOException | BrutException | ParserConfigurationException | TransformerException ex) {
+        } catch (IOException | BrutException | ParserConfigurationException | TransformerException | SAXException ex) {
             throw new AndrolibException(ex);
         }
     }

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java

@@ -130,7 +130,7 @@ public static void setNetworkSecurityConfig(File file) {
      *
      * @param file network security config file
      */
-    public static void modNetworkSecurityConfig(File file) throws ParserConfigurationException, TransformerException {
+    public static void modNetworkSecurityConfig(File file) throws ParserConfigurationException, TransformerException, IOException, SAXException {
         DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder();
         Document document = documentBuilder.newDocument();
@@ -154,13 +154,7 @@ public static void modNetworkSecurityConfig(File file) throws ParserConfiguratio
         certUser.setAttributeNode(attrUser);
         trustAnchors.appendChild(certUser);
 
-        // create the xml file
-        //transform the DOM Object to an XML File
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = transformerFactory.newTransformer();
-        DOMSource domSource = new DOMSource(document);
-        StreamResult streamResult = new StreamResult(file);
-        transformer.transform(domSource, streamResult);
+        saveDocument(file, document);
     }
 
     /**