chore: minor ui fixes

client/ui/controllers/api/apiConfigsController.cpp

@@ -1,13 +1,13 @@
 #include "apiConfigsController.h"
 
 #include <QEventLoop>
+#include <QClipboard>
 
 #include "amnezia_application.h"
 #include "configurators/wireguard_configurator.h"
 #include "core/api/apiDefs.h"
 #include "core/api/apiUtils.h"
 #include "core/controllers/gatewayController.h"
-#include "core/networkUtilities.h"
 #include "core/qrCodeUtils.h"
 #include "ui/controllers/systemController.h"
 #include "version.h"
@@ -76,7 +76,6 @@ bool ApiConfigsController::exportNativeConfig(const QString &serverCountryCode,
     apiPayload[configKey::serverCountryCode] = serverCountryCode;
     apiPayload[configKey::serviceType] = apiConfigObject.value(configKey::serviceType);
     apiPayload[configKey::authData] = serverConfigObject.value(configKey::authData);
-    apiPayload[configKey::uuid] = m_settings->getInstallationUuid(true);
 
     QByteArray responseBody;
     ErrorCode errorCode = gatewayController.post(QString("%1v1/native_config"), apiPayload, responseBody);
@@ -124,6 +123,7 @@ void ApiConfigsController::prepareVpnKeyExport()
     auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
 
     auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString();
+    m_vpnKey = vpnKey;
 
     vpnKey.replace("vpn://", "");
 
@@ -132,6 +132,12 @@ void ApiConfigsController::prepareVpnKeyExport()
     emit vpnKeyExportReady();
 }
 
+void ApiConfigsController::copyVpnKeyToClipboard()
+{
+    auto clipboard = amnApp->getClipboard();
+    clipboard->setText(m_vpnKey);
+}
+
 bool ApiConfigsController::fillAvailableServices()
 {
     GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs);
@@ -288,7 +294,7 @@ bool ApiConfigsController::updateServiceFromTelegram(const int serverIndex)
 
         QByteArray requestBody = QJsonDocument(apiPayload).toJson();
 
-        QNetworkReply *reply = amnApp->manager()->post(request, requestBody);
+        QNetworkReply *reply = amnApp->networkManager()->post(request, requestBody);
 
         QEventLoop wait;
         connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
@@ -477,3 +483,8 @@ int ApiConfigsController::getQrCodesCount()
 {
     return m_qrCodes.size();
 }
+
+QString ApiConfigsController::getVpnKey()
+{
+    return m_vpnKey;
+}

client/ui/controllers/api/apiConfigsController.h

@@ -16,12 +16,14 @@ public:
 
     Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY vpnKeyExportReady)
     Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY vpnKeyExportReady)
+    Q_PROPERTY(QString vpnKey READ getVpnKey NOTIFY vpnKeyExportReady)
 
 public slots:
     bool exportNativeConfig(const QString &serverCountryCode, const QString &fileName);
     bool revokeNativeConfig(const QString &serverCountryCode);
     // bool exportVpnKey(const QString &fileName);
     void prepareVpnKeyExport();
+    void copyVpnKeyToClipboard();
 
     bool fillAvailableServices();
     bool importServiceFromGateway();
@@ -58,8 +60,10 @@ private:
 
     QList<QString> getQrCodes();
     int getQrCodesCount();
+    QString getVpnKey();
 
     QList<QString> m_qrCodes;
+    QString m_vpnKey;
 
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ApiServicesModel> m_apiServicesModel;

client/ui/controllers/api/apiSettingsController.cpp

@@ -1,5 +1,8 @@
 #include "apiSettingsController.h"
 
+#include <QEventLoop>
+#include <QTimer>
+
 #include "core/api/apiUtils.h"
 #include "core/controllers/gatewayController.h"
 
@@ -35,8 +38,14 @@ ApiSettingsController::~ApiSettingsController()
 {
 }
 
-bool ApiSettingsController::getAccountInfo()
+bool ApiSettingsController::getAccountInfo(bool reload)
 {
+    if (reload) {
+        QEventLoop wait;
+        QTimer::singleShot(1000, &wait, &QEventLoop::quit);
+        wait.exec();
+    }
+
     GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), requestTimeoutMsecs);
 
     auto processedIndex = m_serversModel->getProcessedServerIndex();
@@ -62,6 +71,10 @@ bool ApiSettingsController::getAccountInfo()
     QJsonObject accountInfo = QJsonDocument::fromJson(responseBody).object();
     m_apiAccountInfoModel->updateModel(accountInfo, serverConfig);
 
+    if (reload) {
+        updateApiCountryModel();
+    }
+
     return true;
 }
 

client/ui/controllers/api/apiSettingsController.h

@@ -17,7 +17,7 @@ public:
     ~ApiSettingsController();
 
 public slots:
-    bool getAccountInfo();
+    bool getAccountInfo(bool reload);
     void updateApiCountryModel();
 
 signals: