Merge #284: Only write options after onboarding

9e56907 qml: only write options after onboarding (johnny9) c0ebff2 qml: Set OptionQmlModel initial property values (johnny9) Pull request description: [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/284) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/284) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/284) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/unsecure_android_apk.zip?branch=pull/284) ACKs for top commit: D33r-Gee: re ACK 9e56907 on Ubuntu 22.04 works as expected pablomartin4btc: re-ACK 9e56907 Tree-SHA512: 6835569e9a3ab340c94c507867c578e46bb86d8c0c8cad639ed97dd09e7edcdbe2b21c1b58fab74c989cbda22acc768dc6004e27d9a6a66b085ea5ac3ec49474
bitcoin-core · May 14, 2024 · 84d388d · 84d388d
2 parents 085805f + 9e56907
commit 84d388d
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 13 deletions.
diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp
@@ -298,9 +298,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);
 
     AppMode app_mode = SetupAppMode();

diff --git a/src/qml/models/options_model.cpp b/src/qml/models/options_model.cpp
@@ -8,6 +8,7 @@
 #include <common/settings.h>
 #include <common/system.h>
 #include <interfaces/node.h>
+#include <mapport.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
@@ -23,23 +24,34 @@
 #include <QDir>
 #include <QSettings>
 
-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);
 
+    m_listen = SettingToBool(m_node.getPersistentSetting("listen"), DEFAULT_LISTEN);
+
+    m_natpmp = SettingToBool(m_node.getPersistentSetting("natpmp"), DEFAULT_NATPMP);
+
     int64_t prune_value{SettingToInt(m_node.getPersistentSetting("prune"), 0)};
     m_prune = (prune_value > 1);
     m_prune_size_gb = m_prune ? PruneMiBtoGB(prune_value) : DEFAULT_PRUNE_TARGET_GB;
 
     m_script_threads = SettingToInt(m_node.getPersistentSetting("par"), DEFAULT_SCRIPTCHECK_THREADS);
+
+    m_server = SettingToBool(m_node.getPersistentSetting("server"), false);
+
+    m_upnp = SettingToBool(m_node.getPersistentSetting("upnp"), DEFAULT_UPNP);
 }
 
 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);
     }
 }
@@ -48,7 +60,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);
     }
 }
@@ -57,7 +71,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);
     }
 }
@@ -66,7 +82,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);
     }
 }
@@ -75,7 +93,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);
     }
 }
@@ -84,7 +104,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);
     }
 }
@@ -93,7 +115,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);
     }
 }
@@ -102,7 +126,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);
     }
 }
@@ -136,4 +162,31 @@ void OptionsQmlModel::setCustomDataDirArgs(QString path)
         // TODO: add actual custom data wiring
         qDebug() << "PlaceHolder: Created data directory: " << path;
     }
-}
+}
+
+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;
+}
diff --git a/src/qml/models/options_model.h b/src/qml/models/options_model.h
@@ -38,7 +38,7 @@ class OptionsQmlModel : public QObject
     Q_PROPERTY(QUrl getDefaultDataDirectory READ getDefaultDataDirectory CONSTANT)
 
 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);
@@ -69,6 +69,7 @@ public Q_SLOTS:
         m_custom_datadir_string = new_custom_datadir_string;
         m_signalReceived = true;
     }
+    Q_INVOKABLE void onboard();
 
 Q_SIGNALS:
     void dbcacheSizeMiBChanged(int new_dbcache_size_mib);
@@ -83,6 +84,7 @@ public Q_SLOTS:
 
 private:
     interfaces::Node& m_node;
+    bool m_onboarded;
 
     // Properties that are exposed to QML.
     int m_dbcache_size_mib;

diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml
@@ -78,6 +78,7 @@ ApplicationWindow {
             OnboardingConnection {}
 
             onFinishedChanged: {
+                optionsModel.onboard()
                 if (AppMode.walletEnabled && AppMode.isDesktop) {
                     main.push(desktopWallets)
                 } else {