From d8a872e5923a4703a65650c13ad2ea2d9b12c3ef Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 4 Sep 2017 16:14:33 +0900
Subject: [PATCH] Improve ConfigXml code

---
 .../service/SyncthingRunnable.java            |  2 +
 .../syncthingandroid/util/ConfigXml.java      | 71 ++++++-------------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
index 354d5d37..ea132415 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@@ -136,6 +136,8 @@ public class SyncthingRunnable implements Runnable {
                 env.put("STGUIASSETS", externalFilesDir.getAbsolutePath() + "/gui");
             env.put("STNORESTART", "1");
             env.put("STNOUPGRADE", "1");
+            // Disable hash benchmark for faster startup.
+            // https://github.com/syncthing/syncthing/issues/4348
             env.put("STHASHING", "minio");
             if (sp.getBoolean("use_tor", false)) {
                 env.put("all_proxy", "socks5://localhost:9050");
diff --git a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
index 1f5c48f9..2fb1c860 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -121,31 +121,17 @@ public class ConfigXml {
                 changed = true;
             }
 
-            if (applyHashers(r)) {
-                changed = true;
-            }
+            // Set 'hashers' (see https://github.com/syncthing/syncthing-android/issues/384) on the
+            // given folder.
+            changed = setConfigElement(r, "hashers", "1") || changed;
         }
 
         // Enforce TLS.
-        Element gui = (Element) mConfig.getDocumentElement()
-                .getElementsByTagName("gui").item(0);
-        boolean tls = Boolean.parseBoolean(gui.getAttribute("tls"));
-        if (!tls) {
-            Log.i(TAG, "Enforce TLS");
-            gui.setAttribute("tls", Boolean.toString(true));
-            changed = true;
-        }
+        Element gui = getGuiElement();
+        changed = setConfigElement(gui, "tls", "true") || changed;
 
         // Set user to "syncthing"
-        Node user = gui.getElementsByTagName("user").item(0);
-        if (user == null) {
-            user = mConfig.createElement("user");
-            gui.appendChild(user);
-        }
-        if (!user.getTextContent().equals("syncthing")) {
-            user.setTextContent("syncthing");
-            changed = true;
-        }
+        changed = setConfigElement(gui, "user", "syncthing") || changed;
 
         // Set password to the API key
         Node password = gui.getElementsByTagName("password").item(0);
@@ -163,49 +149,32 @@ public class ConfigXml {
             changed = true;
         }
 
+        // Disable weak hash benchmark for faster startup.
+        // https://github.com/syncthing/syncthing/issues/4348
         Element options = (Element) mConfig.getDocumentElement()
                 .getElementsByTagName("options").item(0);
-        Node weakHash = options.getElementsByTagName("weakHashSelectionMethod").item(0);
-        if (!weakHash.getTextContent().equals("never")) {
-            weakHash.setTextContent("never");
-            changed = true;
-        }
+        changed = setConfigElement(options, "weakHashSelectionMethod", "never") || changed;
 
         if (changed) {
             saveChanges();
         }
     }
 
-    /**
-     * Set 'hashers' (see https://github.com/syncthing/syncthing-android/issues/384) on the
-     * given folder.
-     *
-     * @return True if the XML was changed.
-     */
-    private boolean applyHashers(Element folder) {
-        NodeList childs = folder.getChildNodes();
-        for (int i = 0; i < childs.getLength(); i++) {
-            Node item = childs.item(i);
-            if (item.getNodeName().equals("hashers")) {
-                if (item.getTextContent().equals(Integer.toString(0))) {
-                    item.setTextContent(Integer.toString(1));
-                    return true;
-                }
-                return false;
-            }
+    private boolean setConfigElement(Element parent, String tagName, String textContent) {
+        Node element = parent.getElementsByTagName(tagName).item(0);
+        if (element == null) {
+            element = mConfig.createElement(tagName);
+            parent.appendChild(element);
         }
-
-        // XML tag does not exist, create it.
-        Log.i(TAG, "Set 'hashers' on folder " + folder.getAttribute("id"));
-        Element newElem = mConfig.createElement("hashers");
-        newElem.setTextContent(Integer.toString(1));
-        folder.appendChild(newElem);
-        return true;
+        if (!textContent.equals(element.getTextContent())) {
+            element.setTextContent(textContent);
+            return true;
+        }
+        return false;
     }
 
     private Element getGuiElement() {
-        return (Element) mConfig.getDocumentElement()
-                .getElementsByTagName("gui").item(0);
+        return (Element) mConfig.getDocumentElement().getElementsByTagName("gui").item(0);
     }
 
     /**