Some improvements

plugins/Pass/CMakeLists.txt

@@ -7,6 +7,7 @@ set(
         pass.cpp
         passkeyringmodel.h
         passphraseprovider.h
+        error.h
         jobs/decryptjob.cpp
         jobs/deletekeyjob.cpp
         jobs/getkeysjob.cpp

plugins/Pass/error.h

@@ -0,0 +1,30 @@
+// error.h
+#ifndef ERROR_H
+#define ERROR_H
+
+extern "C" {
+#include "rnp/rnp_err.h"
+}
+
+enum ErrorCodeShow {
+    UnexceptedError= 1,
+    BadPassphrase,
+    NoKeyFound,
+    DecryptFailed
+};
+
+ErrorCodeShow rnpErrorToErrorCodeShow(int rnpErrorCode) {
+    switch (rnpErrorCode) {
+    case RNP_ERROR_BAD_PASSWORD:
+        return BadPassphrase;
+    case RNP_ERROR_KEY_NOT_FOUND:
+    case RNP_ERROR_NO_SUITABLE_KEY:
+        return NoKeyFound;
+    case RNP_ERROR_DECRYPT_FAILED:
+        return DecryptFailed;
+    default:
+        return UnexceptedError;
+    }
+}
+
+#endif // ERROR_H

plugins/Pass/pass.cpp

@@ -3,6 +3,7 @@
 #include <QtCore/QDir>
 #include <QDirIterator>
 #include <QtConcurrent/QtConcurrent>
+#include "error.h"
 #include "jobs/decryptjob.h"
 #include "jobs/deletekeyjob.h"
 #include "jobs/getkeysjob.h"
@@ -108,7 +109,7 @@ bool Pass::show(QUrl url)
 void Pass::slotShowError(rnp_result_t err)
 {
     qInfo() << "[Pass] Show Failed";
-    emit showFailed(rnp_result_to_string(err));
+    emit showFailed(rnpErrorToErrorCodeShow(err), rnp_result_to_string(err));
     this->m_sem->release(1);
 }
 
@@ -136,13 +137,13 @@ bool Pass::deletePasswordStore()
 }
 
 void Pass::slotDeletePasswordStoreResult(bool err)
-{
-    this->initPasswordStore(); // reinit an empty password-store
+{ 
     if (err) {
         qInfo() << "[Pass] Delete Password Store Failed";
         emit deletePasswordStoreFailed("failed to delete password store");
     } else {
         qInfo() << "[Pass] Delete Password Store Succeed";
+        this->initPasswordStore(); // reinit an empty password-store
         emit deletePasswordStoreSucceed();
     }
     this->m_sem->release(1);

plugins/Pass/pass.h

@@ -125,7 +125,7 @@ signals:
      * @brief Emitted when showing a password fails.
      * @param message The error message describing the failure.
      */
-    void showFailed(QString message);
+    void showFailed(int err, QString message);
 
     /**
      * @brief Emitted hen showing a password cancelled.