qml: only write options after onboarding

Author: johnny9

src/qml/bitcoin.cpp

@@ -280,9 +280,8 @@ int QmlGuiMain(int argc, char* argv[])
     engine.rootContext()->setContextProperty("peerTableModel", &peer_model);
     engine.rootContext()->setContextProperty("peerListModelProxy", &peer_model_sort_proxy);
 
-    OptionsQmlModel options_model{*node};
+    OptionsQmlModel options_model(*node, !need_onboarding.toBool());
     engine.rootContext()->setContextProperty("optionsModel", &options_model);
-
     engine.rootContext()->setContextProperty("needOnboarding", need_onboarding);
 #ifdef __ANDROID__
     AppMode app_mode(AppMode::MOBILE);

src/qml/models/options_model.cpp

@@ -17,8 +17,9 @@
 
 #include <cassert>
 
-OptionsQmlModel::OptionsQmlModel(interfaces::Node& node)
+OptionsQmlModel::OptionsQmlModel(interfaces::Node& node, bool is_onboarded)
     : m_node{node}
+    , m_onboarded{is_onboarded}
 {
     m_dbcache_size_mib = SettingToInt(m_node.getPersistentSetting("dbcache"), nDefaultDbCache);
 
@@ -41,7 +42,9 @@ void OptionsQmlModel::setDbcacheSizeMiB(int new_dbcache_size_mib)
 {
     if (new_dbcache_size_mib != m_dbcache_size_mib) {
         m_dbcache_size_mib = new_dbcache_size_mib;
-        m_node.updateRwSetting("dbcache", new_dbcache_size_mib);
+        if (m_onboarded) {
+            m_node.updateRwSetting("dbcache", new_dbcache_size_mib);
+        }
         Q_EMIT dbcacheSizeMiBChanged(new_dbcache_size_mib);
     }
 }
@@ -50,7 +53,9 @@ void OptionsQmlModel::setListen(bool new_listen)
 {
     if (new_listen != m_listen) {
         m_listen = new_listen;
-        m_node.updateRwSetting("listen", new_listen);
+        if (m_onboarded) {
+            m_node.updateRwSetting("listen", new_listen);
+        }
         Q_EMIT listenChanged(new_listen);
     }
 }
@@ -59,7 +64,9 @@ void OptionsQmlModel::setNatpmp(bool new_natpmp)
 {
     if (new_natpmp != m_natpmp) {
         m_natpmp = new_natpmp;
-        m_node.updateRwSetting("natpmp", new_natpmp);
+        if (m_onboarded) {
+            m_node.updateRwSetting("natpmp", new_natpmp);
+        }
         Q_EMIT natpmpChanged(new_natpmp);
     }
 }
@@ -68,7 +75,9 @@ void OptionsQmlModel::setPrune(bool new_prune)
 {
     if (new_prune != m_prune) {
         m_prune = new_prune;
-        m_node.updateRwSetting("prune", pruneSetting());
+        if (m_onboarded) {
+            m_node.updateRwSetting("prune", pruneSetting());
+        }
         Q_EMIT pruneChanged(new_prune);
     }
 }
@@ -77,7 +86,9 @@ void OptionsQmlModel::setPruneSizeGB(int new_prune_size_gb)
 {
     if (new_prune_size_gb != m_prune_size_gb) {
         m_prune_size_gb = new_prune_size_gb;
-        m_node.updateRwSetting("prune", pruneSetting());
+        if (m_onboarded) {
+            m_node.updateRwSetting("prune", pruneSetting());
+        }
         Q_EMIT pruneSizeGBChanged(new_prune_size_gb);
     }
 }
@@ -86,7 +97,9 @@ void OptionsQmlModel::setScriptThreads(int new_script_threads)
 {
     if (new_script_threads != m_script_threads) {
         m_script_threads = new_script_threads;
-        m_node.updateRwSetting("par", new_script_threads);
+        if (m_onboarded) {
+            m_node.updateRwSetting("par", new_script_threads);
+        }
         Q_EMIT scriptThreadsChanged(new_script_threads);
     }
 }
@@ -95,7 +108,9 @@ void OptionsQmlModel::setServer(bool new_server)
 {
     if (new_server != m_server) {
         m_server = new_server;
-        m_node.updateRwSetting("server", new_server);
+        if (m_onboarded) {
+            m_node.updateRwSetting("server", new_server);
+        }
         Q_EMIT serverChanged(new_server);
     }
 }
@@ -104,7 +119,9 @@ void OptionsQmlModel::setUpnp(bool new_upnp)
 {
     if (new_upnp != m_upnp) {
         m_upnp = new_upnp;
-        m_node.updateRwSetting("upnp", new_upnp);
+        if (m_onboarded) {
+            m_node.updateRwSetting("upnp", new_upnp);
+        }
         Q_EMIT upnpChanged(new_upnp);
     }
 }
@@ -114,3 +131,30 @@ common::SettingsValue OptionsQmlModel::pruneSetting() const
     assert(!m_prune || m_prune_size_gb >= 1);
     return m_prune ? PruneGBtoMiB(m_prune_size_gb) : 0;
 }
+
+void OptionsQmlModel::onboard()
+{
+    m_node.resetSettings();
+    if (m_dbcache_size_mib != nDefaultDbCache) {
+        m_node.updateRwSetting("dbcache", m_dbcache_size_mib);
+    }
+    if (m_listen) {
+        m_node.updateRwSetting("listen", m_listen);
+    }
+    if (m_natpmp) {
+        m_node.updateRwSetting("natpmp", m_natpmp);
+    }
+    if (m_prune) {
+        m_node.updateRwSetting("prune", pruneSetting());
+    }
+    if (m_script_threads != DEFAULT_SCRIPTCHECK_THREADS) {
+        m_node.updateRwSetting("par", m_script_threads);
+    }
+    if (m_server) {
+        m_node.updateRwSetting("server", m_server);
+    }
+    if (m_upnp) {
+        m_node.updateRwSetting("upnp", m_upnp);
+    }
+    m_onboarded = true;
+}

src/qml/models/options_model.h

@@ -34,7 +34,7 @@ class OptionsQmlModel : public QObject
     Q_PROPERTY(bool upnp READ upnp WRITE setUpnp NOTIFY upnpChanged)
 
 public:
-    explicit OptionsQmlModel(interfaces::Node& node);
+    explicit OptionsQmlModel(interfaces::Node& node, bool is_onboarded);
 
     int dbcacheSizeMiB() const { return m_dbcache_size_mib; }
     void setDbcacheSizeMiB(int new_dbcache_size_mib);
@@ -56,6 +56,7 @@ class OptionsQmlModel : public QObject
     void setServer(bool new_server);
     bool upnp() const { return m_upnp; }
     void setUpnp(bool new_upnp);
+    Q_INVOKABLE void onboard();
 
 Q_SIGNALS:
     void dbcacheSizeMiBChanged(int new_dbcache_size_mib);
@@ -69,6 +70,7 @@ class OptionsQmlModel : public QObject
 
 private:
     interfaces::Node& m_node;
+    bool m_onboarded;
 
     // Properties that are exposed to QML.
     int m_dbcache_size_mib;

src/qml/pages/main.qml

@@ -66,7 +66,10 @@ ApplicationWindow {
             OnboardingStorageAmount {}
             OnboardingConnection {}
 
-            onFinishedChanged: main.push(node)
+            onFinishedChanged: {
+                optionsModel.onboard()
+                main.push(node)
+            }
         }
     }