Merge pull request #1008 from deXol/develop

Fix delete credential in MMM issue

Author: limpkin

src/CredentialsManagement.cpp

@@ -535,6 +535,11 @@ bool CredentialsManagement::confirmDiscardUneditedCredentialChanges(const QModel
 
     if (pLoginItem != nullptr)
     {
+        if (pLoginItem->isDeleted())
+        {
+            // Do not need to check for discard, login is deleted
+            return true;
+        }
         // Retrieve parent item
         TreeItem *pServiceItem = pLoginItem->parentItem();
         if (pServiceItem != nullptr)
@@ -549,7 +554,7 @@ bool CredentialsManagement::confirmDiscardUneditedCredentialChanges(const QModel
 
             if ((!sPassword.isEmpty() && (sPassword != pLoginItem->password())) ||
                     (!sDescription.isEmpty() && (sDescription != pLoginItem->description())) ||
-                    (sLogin != pLoginItem->name()) ||
+                    (!sLogin.isEmpty() && sLogin != pLoginItem->name()) ||
                     (wsClient->isMPBLE() && iCategory != 0 && iCategory != pLoginItem->category()) ||
                     (wsClient->isMPBLE() && iKeyAfterLogin != SettingsGuiBLE::DEFAULT_INDEX && iKeyAfterLogin != pLoginItem->keyAfterLogin()) ||
                     (wsClient->isMPBLE() && iKeyAfterPwd != SettingsGuiBLE::DEFAULT_INDEX && iKeyAfterPwd != pLoginItem->keyAfterPwd()))
@@ -826,6 +831,7 @@ void CredentialsManagement::on_pushButtonDelete_clicked()
         {
             ui->credDisplayFrame->setEnabled(false);
             clearLoginDescription();
+            pLoginItem->setDeleted(true);
 
             QModelIndexList nextRow = m_pCredModelFilter->getNextRow(lIndexes.at(0));
             auto selectionModel = ui->credentialTreeView->selectionModel();

src/DbBackupsTrackerController.cpp

@@ -76,10 +76,6 @@ void DbBackupsTrackerController::setBackupFilePath(const QString &path)
     {
         // Just ignore it
     }
-    if (path.isEmpty())
-    {
-        disconnectDbBackupsTracker();
-    }
 }
 
 void DbBackupsTrackerController::handleCardDbMetadataChanged(QString cardId,

src/LoginItem.h

@@ -28,12 +28,15 @@ class LoginItem : public TreeItem
     virtual TreeType treeType()  const Q_DECL_OVERRIDE;
     void setTOTPCredential(QString secretKey, int timeStep, int codeSize);
     void setTOTPDeleted(bool deleted) { m_totpDeleted = deleted; }
+    void setDeleted(bool val) { m_bDeleted = val; }
+    bool isDeleted() const { return m_bDeleted; }
 private:    
     QByteArray m_bAddress;
     qint8 m_iFavorite;
     QString m_sPassword;
     QString m_sPasswordOrig;
     bool m_bPasswordLocked;
+    bool m_bDeleted = false;
 
     struct TOTPCredential
     {