From 1c020691b15c17b4e6f612108cf039cfd66e48e7 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sat, 13 Jun 2020 01:01:26 +0200
Subject: [PATCH] backup encrypted addresslabels to restore it later if needed

---
 src/chatmodel.cpp       | 20 +-------------------
 src/firsttimewizard.cpp | 12 ++++++++++++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 91c51b2..a563398 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -734,25 +734,7 @@ void::MainWindow::addContact()
 
 
         QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
-
-    QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () {
-        
-        QString addr = request.zaddr->text();
-        QString myAddr = request.myzaddr->text().trimmed();
-        QString memo = request.memorequest->toPlainText().trimmed();
-        QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png");
-        QString label = request.labelRequest->text().trimmed();
-
-
-        contactRequest.setSenderAddress(myAddr);
-        contactRequest.setReceiverAddress(addr);
-        contactRequest.setMemo(memo);
-        contactRequest.setCid(cid);
-        contactRequest.setAvatar(avatar);
-        contactRequest.setLabel(label);
-
-    });
-        
+      
    QObject::connect(request.sendRequestButton, &QPushButton::clicked, this, &MainWindow::saveandsendContact);
 
 
diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp
index 5ef96bb..ca22f4f 100644
--- a/src/firsttimewizard.cpp
+++ b/src/firsttimewizard.cpp
@@ -16,6 +16,18 @@ FirstTimeWizard::FirstTimeWizard(bool dangerous, QString server)
     this->dangerous = dangerous;
     this->server = server;
 
+    ////backup addresslabels.dat if there is one, to restore it later
+
+    auto dir =  QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+    QString addressbook = dir.filePath("addresslabels.dat.enc");
+    QFile file(addressbook);
+
+    if (file.exists())
+    {
+    file.rename(dir.filePath("addresslabels.dat.enc-backup"));
+
+    }
+
     // Create the pages
     setPage(Page_NewOrRestore, new NewOrRestorePage(this));
     setPage(Page_New, new NewSeedPage(this));