Manage connection

src/settings.cpp

@@ -6,9 +6,6 @@
 Settings* Settings::instance = nullptr;
 
 Settings::~Settings() {
-    delete defaults;
-    delete zcashconf;
-    delete uisettings;
 }
 
 bool Settings::getSaveZtxs() {
@@ -24,27 +21,6 @@ Settings* Settings::init() {
     if (instance == nullptr) 
         instance = new Settings();
 
-    // There are 3 possible configurations
-    // 1. The defaults
-    instance->defaults = new Config{ "127.0.0.1", "8232", "", "" };
-
-    // 2. From the UI settings
-    auto settingsFound = instance->loadFromSettings();
-
-    // 3. From the zcash.conf file
-    auto confFound = instance->loadFromFile();
-
-    // zcash.conf (#3) is first priority if it exists
-    if (confFound) {
-        instance->currentConfig = instance->zcashconf;
-    }
-    else if (settingsFound) {
-        instance->currentConfig = instance->uisettings;
-    }
-    else {
-        instance->currentConfig = instance->defaults;
-    }
-
     return instance;
 }
 
@@ -52,23 +28,7 @@ Settings* Settings::getInstance() {
     return instance;
 }
 
-
-QString Settings::getHost() {
-    return currentConfig->host;
-}
-
-QString Settings::getPort() {
-    return currentConfig->port;
-}
-
-
-QString Settings::getUsernamePassword() {
-    return currentConfig->rpcuser % ":" % currentConfig->rpcpassword;
-}
-
-bool Settings::loadFromSettings() {
-    delete uisettings;
-
+Config Settings::getSettings() {
     // Load from the QT Settings. 
     QSettings s;
     
@@ -77,9 +37,7 @@ bool Settings::loadFromSettings() {
     auto username    = s.value("connection/rpcuser").toString();
     auto password    = s.value("connection/rpcpassword").toString();    
 
-    uisettings = new Config{host, port, username, password};
-
-    return !username.isEmpty();
+    return Config{host, port, username, password};
 }
 
 void Settings::saveSettings(const QString& host, const QString& port, const QString& username, const QString& password) {
@@ -96,63 +54,9 @@ void Settings::saveSettings(const QString& host, const QString& port, const QStr
     init();
 }
 
-bool Settings::loadFromFile() {
-    delete zcashconf;
-
-#ifdef Q_OS_LINUX
-    confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".zcash/zcash.conf");
-#elif defined(Q_OS_DARWIN)
-    confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "/Library/Application Support/Zcash/zcash.conf");
-#else
-    confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Zcash/zcash.conf");
-#endif
-
-    confLocation = QDir::cleanPath(confLocation);
-
-    if (confLocation.isNull()) {
-        // No zcash file, just return with nothing
-        return false;
-    }
-
-    QFile file(confLocation);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qDebug() << file.errorString();
-        return false;
-    }
-
-    QTextStream in(&file);
-
-    zcashconf = new Config();
-    zcashconf->host = defaults->host;
-
-    while (!in.atEnd()) {
-        QString line = in.readLine();
-        auto s = line.indexOf("=");
-        QString name  = line.left(s).trimmed().toLower();
-        QString value = line.right(line.length() - s - 1).trimmed();
-
-        if (name == "rpcuser") {
-            zcashconf->rpcuser = value;
-        }
-        if (name == "rpcpassword") {
-            zcashconf->rpcpassword = value;
-        }
-        if (name == "rpcport") {
-            zcashconf->port = value;
-        }
-        if (name == "testnet" &&
-            value == "1"  &&
-            zcashconf->port.isEmpty()) {
-                zcashconf->port = "18232";
-        }
-    }
-
-    // If rpcport is not in the file, and it was not set by the testnet=1 flag, then go to default
-    if (zcashconf->port.isEmpty()) zcashconf->port = defaults->port;
-
-    file.close();
-
-    return true;
+void Settings::setUsingZcashConf(QString confLocation) {
+    if (!confLocation.isEmpty())
+        _confLocation = confLocation;
 }
 
 bool Settings::isTestnet() {