Add delete password store feature

plugins/Git/git.cpp

@@ -30,10 +30,10 @@ bool Git::clone(QString url, QString path, cred_type mode)
         return false;
     }
     auto v =  overload {
-      [](const HTTP & x)        { return "HTTP"; },
+        [](const HTTP & x)        { return "HTTP"; },
         [](const HTTPUserPass & x)    { return "HTTPAuth"; },
-      [](const SSHPass & x)     { return "SSHAuth"; },
-      [](const SSHKey & x)      { return "SSHKey"; },
+        [](const SSHPass & x)     { return "SSHAuth"; },
+        [](const SSHKey & x)      { return "SSHKey"; },
     };
     qDebug() << "Creating clone Job  " << url << " " << path << " " << std::visit(v, mode);
     CloneJob *clone_job = new CloneJob(url, path, mode);

plugins/Git/jobs/clonejob.cpp

@@ -19,7 +19,8 @@ CloneJob::CloneJob(QString url, QString path, cred_type cred):
 }
 
 
-void CloneJob::run() {
+void CloneJob::run()
+{
     auto tmp_dir = this->cloneSetup();
     auto err = this->clone(this->m_url,  tmp_dir.absolutePath(), this->m_cred, this->credentialsCB);
     if (err) {

plugins/Git/jobs/clonejob.h

@@ -11,8 +11,6 @@ extern "C" {
  * @class CloneJob
  * @brief A class to handle cloning Git repositories in a separate thread.
  *
- * The CloneJob runs a cloning process in a separate thread and emits
- * signals to indicate the success or failure of the operation.
  */
 class CloneJob : public GitJob
 {
@@ -21,9 +19,8 @@ class CloneJob : public GitJob
     /**
      * @brief The main function that performs the cloning operation.
      *
-     * This function overrides the `run()` method from the `QThread` class. It is
-     * executed when the thread is started, and it handles the process of cloning
-     * a repository from the specified URL to the target path.
+     * Handles the process of cloning a repository from the specified URL
+     * to the target path.
      */
     void run() override;
 
@@ -31,8 +28,7 @@ signals:
     /**
      * @brief Signal emitted when the cloning operation is complete.
      *
-     * This signal is emitted once the cloning operation finishes. It notifies
-     * the caller whether an error occurred during the cloning process.
+     * This signal is emitted once the cloning operation finishes.
      *
      * @param err A boolean indicating whether an error occurred during cloning.
      *        `true` if an error occurred, `false` if the clone was successful.
@@ -47,8 +43,6 @@ private:
      * @brief Prepares the temporary directory for cloning.
      *
      * This method sets up the required directory structure for cloning a repository.
-     * It is called before the cloning process begins to ensure that a suitable
-     * location exists for the repository to be cloned into.
      *
      * @return A `QDir` object representing the prepared temporary directory.
      */

plugins/Git/jobs/gitjob.h

@@ -30,10 +30,8 @@ typedef std::variant<HTTP, HTTPUserPass, SSHPass, SSHKey> cred_type;
  * @class GitJob
  * @brief A class that manages Git-related tasks using libgit2.
  *
- * The GitJob class is used to perform Git operations, such as cloning repositories,
- * in a separate thread. It utilizes libgit2 for interacting with Git repositories.
- * The class handles credentials for repository access and allows the user to specify
- * the type of credentials to use.
+ * The GitJob class is used abstraction class to perform Git operations, such as cloning repositories,
+ * in a separate thread using libgit2 for interacting with Git repositories.
  */
 class GitJob : public QThread
 {

plugins/Pass/CMakeLists.txt

@@ -8,6 +8,7 @@ set(
         gpg.cpp
         passkeymodel.h
         passphraseprovider.h
+        jobs/rmjob.cpp
 )
 
 set(CMAKE_AUTOMOC ON)

plugins/Pass/gpg.cpp

@@ -25,7 +25,6 @@
 
 
 #include "gpg.h"
-#include "passkeymodel.h"
 #include "passphraseprovider.h"
 
 
@@ -234,7 +233,7 @@ void Gpg::getKeysJobResultSlot(const GpgME::KeyListResult &result, const std::ve
                                const QString &auditLogAsHtml, const GpgME::Error &auditLogError)
 {
     if (result.error()) {
-        qWarning() << "Something gone wrong on decrypt";
+        qWarning() << "Something gone wrong on getKeys";
         qDebug() << "Code Error : " << result.error().code();
         qDebug() << "Error str : " << result.error().asString();
     }
@@ -287,14 +286,13 @@ Error Gpg::deleteKey(const Key key)
     QObject::connect(job, &DeleteJob::result,
                      this, &Gpg::deleteKeySlot);
 
-    return openpgp()->deleteJob()->start(key, true);
+    return job->start(key, true);
 }
 
 void Gpg::deleteKeySlot(const GpgME::Error &error, const QString &auditLogAsHtml, const GpgME::Error &auditLogError)
 {
-
     if (error) {
-        qWarning() << "Something gone wrong on decrypt";
+        qWarning() << "Something gone wrong on deleteKey";
         qDebug() << "Code Error : " << error.code();
         qDebug() << "Error str : " << error.asString();
     }

plugins/Pass/jobs/rmjob.cpp

@@ -0,0 +1,24 @@
+#include "rmjob.h"
+
+RmJob::RmJob(QString path):
+    m_path(path)
+{
+    this->setObjectName("RmJob");
+}
+
+
+void RmJob::run()
+{
+    auto info = QFileInfo(this->m_path);
+    if (info.isFile()) {
+        auto file = QFile(this->m_path);
+        file.remove();
+        emit resultReady(false);
+    } else if (info.isDir()) {
+        auto dir = QDir(this->m_path);
+        dir.removeRecursively();
+        emit resultReady(false);
+    } else {
+        emit resultReady(true);
+    }
+}

plugins/Pass/jobs/rmjob.h

@@ -0,0 +1,46 @@
+#ifndef RMJOB_H
+#define RMJOB_H
+
+#include <QThread>
+#include <QDir>
+
+/**
+ * @class RmJob
+ * @brief A class to handle removing recursively a path in a separate thread.
+ *
+ */
+class RmJob : public QThread
+{
+    Q_OBJECT
+
+    /**
+     * @brief The main function that performs the rm operation.
+     *
+     * Handles the process of removing recursively a target path.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Signal emitted when the rm operation is complete.
+     *
+     * @param err A boolean indicating whether an error occurred during cloning.
+     *        `true` if an error occurred, `false` if the clone was successful.
+     */
+    void resultReady(const bool err);
+
+private:
+    QString m_path; ///< The path to be removed.
+
+public:
+    /**
+     * @brief Constructor for the RmJob class.
+     *
+     * Initializes the RmJob with the specified path to be removed.
+     *
+     * @param path Path to be remove.
+     */
+    RmJob(QString path);
+};
+
+#endif // RMJOB_H

plugins/Pass/pass.cpp

@@ -2,6 +2,7 @@
 #include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
 
+#include "jobs/rmjob.h"
 #include "pass.h"
 #include "gpg.h"
 #include "passkeymodel.h"
@@ -43,44 +44,73 @@ bool Pass::show(QUrl url)
         return false;
     }
     auto path = url.toLocalFile();
-    qInfo() << "Staring decrypting job for " << path;
+    qInfo() << "Pass show  " << path;
     QFileInfo file_info(path);
     this->m_show_filename = file_info.completeBaseName();
     return this->m_gpg->decryptFromFile(path);
 }
 
+
 void Pass::showResult(Error err, QString plain_text)
 {
-    qInfo() << "Result for decrypting job";
+    qDebug() << "Pass show Result";
     if (err) {
-        qInfo() << "Decrypt Failed";
+        qInfo() << "Pass show Failed";
         emit showFailed(err.asString());
 
-    }  else if (err.isCanceled()){
-            qInfo() << "Decrypt Cancelled";
-            emit showCancelled();
+    }  else if (err.isCanceled()) {
+        qInfo() << "Pass show Cancelled";
+        emit showCancelled();
     } else {
-        qInfo() << "Decrypt OK";
+        qInfo() << "Pass show Succeed";
         emit showSucceed(this->m_show_filename, plain_text);
     }
     this->m_show_filename = QString();
     this->m_sem->release(1);
 }
 
-bool Pass::deleteGPGKey(Key key)
+bool Pass::deletePasswordStore()
+{
+    qInfo() << "Pass delete Password Store";
+    auto job = new RmJob(this->password_store());
+    qDebug() << "Delete Password Store at " << this->password_store();
+    connect(job, &RmJob::resultReady, this, &Pass::deletePasswordStoreResult);
+    connect(job, &RmJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+void Pass::deletePasswordStoreResult(bool err)
+{
+    qDebug() << "Pass delete Password StoreResult";
+    if (err) { //dir.removeRecursively()) {
+        qInfo() << "Pass delete Password Store Failed";
+        emit deletePasswordStoreFailed("failed to delete password store");
+
+    } else {
+        qInfo() << "Pass delete Password Store Succeed";
+        emit deletePasswordStoreSucceed();
+    }
+}
+
+
+bool Pass::deleteGPGKey(PassKeyModel* key)
 {
     if (!this->m_sem->tryAcquire(1, 500)) {
         return false;
     }
-    qInfo() << "Deleting Key";
-    return this->m_gpg->deleteKey(key);
+    qInfo() << "Delete Key " << key->uid();
+    return this->m_gpg->deleteKey(key->key());
 }
 
 void Pass::deleteGPGKeyResult(Error err)
 {
+    qDebug() << "Delete Ke yResult";
     if (err) {
+        qInfo() << "Delete Key Failed";
         emit deleteGPGKeyFailed(err.asString());
     } else {
+        qInfo() << "Delete Key Succeed";
         emit deleteGPGKeySucceed();
     }
     this->m_sem->release(1);
@@ -91,15 +121,18 @@ bool Pass::importGPGKey(QUrl url)
     if (!this->m_sem->tryAcquire(1, 500)) {
         return false;
     }
-    qInfo() << "Importing Key from " << url;
+    qInfo() << "Import GPG Key from " << url;
     return this->m_gpg->importKeysFromFile(url.toLocalFile());
 }
 
 void Pass::importGPGKeyResult(Error err)
 {
+    qDebug() << "Import GPG Key Result";
     if (err) {
+        qInfo() << "Delete Key Failed";
         emit importGPGKeyFailed(err.asString());
     } else {
+        qInfo() << "Delete Key Succeed";
         emit importGPGKeySucceed();
     }
     this->m_sem->release(1);
@@ -110,15 +143,18 @@ bool Pass::getAllGPGKeys()
     if (!this->m_sem->tryAcquire(1, 500)) {
         return false;
     }
-    qInfo() << "Getting all key form gpg ";
+    qInfo() << "Get GPG keys";
     return this->m_gpg->getAllKeys();
 }
 
 void Pass::getAllGPGKeysResult(Error err,  std::vector<GpgME::Key> keys_info)
 {
+    qDebug() << "Get GPG keys Result";
     if (err) {
+        qInfo() << "Get GPG Failed";
         emit getAllGPGKeysFailed(err.asString());
     } else {
+        qInfo() << "Get GPG Succeed";
         emit getAllGPGKeysSucceed(QVariant::fromValue(PassKeyModel::keysToPassKey(keys_info)));
     }
     this->m_sem->release(1);
@@ -126,6 +162,6 @@ void Pass::getAllGPGKeysResult(Error err,  std::vector<GpgME::Key> keys_info)
 
 void Pass::responsePassphraseDialog(bool cancel, QString passphrase)
 {
-    qDebug() << "responsePassphraseDialog";
+    qDebug() << "Propagate responsePassphraseDialog";
     emit responsePassphraseDialogPropagate(cancel, passphrase);
 }

plugins/Pass/pass.h

@@ -49,6 +49,12 @@ private slots:
      */
     void getAllGPGKeysResult(Error err, std::vector<GpgME::Key> keys_info);
 
+    /**
+     * @brief Slot to handle the result of a delete Password Store operation.
+     * @param err True if an error occurred during the operation.
+     */
+    void deletePasswordStoreResult(bool err);
+
 signals:
     // GPG-related signals
     /**
@@ -79,8 +85,6 @@ signals:
      */
     void getAllGPGKeysSucceed(QVariant keys_info);
 
-
-
     /**
      * @brief Emitted when retrieving GPG keys fails.
      * @param message The error message describing the failure.
@@ -113,6 +117,18 @@ signals:
      */
     void showCancelled();
 
+
+    /**
+     * @brief Emitted when the password store is successfully deleted.
+     */
+    void deletePasswordStoreSucceed();
+
+    /**
+     * @brief Emitted when deleting the password store fails.
+     * @param message The error message describing the failure.
+     */
+    void deletePasswordStoreFailed(QString message);
+
 private:
     QString m_password_store; /**< The path to the password store. */
     std::unique_ptr<Gpg> m_gpg; /**< The GPG instance used for encryption/decryption. */
@@ -143,22 +159,22 @@ public:
     // GPG-related methods
 
     /**
-     * @brief Deletes the specified GPG key.
-     * @param key The GPG key to delete.
-     * @return True if the operation was successful, false otherwise.
+     * @brief Launch the job to delete the specified GPG key.
+     * @param key The PassKeyModel to delete.
+     * @return True if the job was start successfully, false otherwise.
      */
-    Q_INVOKABLE bool deleteGPGKey(Key key);
+    Q_INVOKABLE bool deleteGPGKey(PassKeyModel* key);
 
     /**
-     * @brief Imports a GPG key from the given URL.
+     * @brief Launch the job to import a GPG key from the given URL.
      * @param url The URL to import the GPG key from.
-     * @return True if the operation was successful, false otherwise.
+     * @return True if the job was start was successfully, false otherwise.
      */
     Q_INVOKABLE bool importGPGKey(QUrl url);
 
     /**
-     * @brief Retrieves all GPG keys.
-     * @return True if the operation was successful, false otherwise.
+     * @brief  Launch the to retrieve all GPG keys.
+     * @return True if the job was start was successfully, false otherwise.
      */
     Q_INVOKABLE bool getAllGPGKeys();
 
@@ -172,11 +188,17 @@ public:
     // Password store-related methods
 
     /**
-     * @brief Shows the password associated with the specified URL.
+     * @brief Launch the job to shows the password associated with the specified URL.
      * @param url The URL pointing to the password store entry.
-     * @return True if the operation was successful, false otherwise.
+     * @return True if the job was start successfully, false otherwise.
      */
     Q_INVOKABLE bool show(QUrl url);
+
+    /**
+     * @brief Launch the job to delete the password store.
+     * @return True if  if the job was start successfully, false otherwise.
+     */
+    Q_INVOKABLE bool deletePasswordStore();
 };
 
 #endif

plugins/Utils/utils.cpp

@@ -59,7 +59,8 @@ bool Utils::rmDir(QUrl dir_url)
     return dir.removeRecursively();
 }
 
-QString Utils::manifestPath(){
+QString Utils::manifestPath()
+{
     auto path = QDir(QDir::currentPath()).filePath("manifest_.json");
     qDebug() << "Manifest path : " << path;
     return path;

po/utpass.qrouland.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: utpass.qrouland\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-17 10:40+0100\n"
+"POT-Creation-Date: 2025-01-20 14:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,26 +79,32 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:37
-msgid ""
-"No password found<br>You can import a password store by cloning or importing "
-"a zip in the settings"
+#: ../qml/pages/PasswordList.qml:43
+msgid "No password found"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:71 ../qml/pages/settings/InfoKeys.qml:169
+#: ../qml/pages/PasswordList.qml:54
+msgid "You can import a password store by cloning or"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:60
+msgid "importing a password store zip in the settings"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:93
 msgid "Decryption failed !"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:85
+#: ../qml/pages/PasswordList.qml:107
 msgid "Back"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:92 ../qml/pages/headers/MainHeader.qml:9
+#: ../qml/pages/PasswordList.qml:114 ../qml/pages/headers/MainHeader.qml:9
 #: ../qml/pages/headers/StackHeader.qml:9 UTPass.desktop.in.h:1
 msgid "UTPass"
 msgstr ""
 
-#: ../qml/pages/headers/MainHeader.qml:26 ../qml/pages/settings/Settings.qml:70
+#: ../qml/pages/headers/MainHeader.qml:26 ../qml/pages/settings/Settings.qml:75
 msgid "Settings"
 msgstr ""
 
@@ -106,6 +112,35 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: ../qml/pages/settings/DeleteRepo.qml:41
+#: ../qml/pages/settings/Settings.qml:58
+msgid "Delete Password Store"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:57
+msgid "You're are about to delete<br>the current Password Store.<br>Continue ?"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:58
+#: ../qml/pages/settings/ImportZip.qml:62
+#: ../qml/pages/settings/InfoKeys.qml:140
+#: ../qml/pages/settings/git/ImportGitClone.qml:55
+msgid "Yes"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:71
+msgid "Password Store removal failed !"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:80
+msgid "Password Store deleted !"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:92
+#: ../qml/pages/settings/InfoKeys.qml:182
+msgid "Info Keys"
+msgstr ""
+
 #: ../qml/pages/settings/ImportKeyFile.qml:57
 msgid "Key import failed !"
 msgstr ""
@@ -123,18 +158,12 @@ msgid ""
 "Importing a new zip will delete<br>any existing password store!<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:62
-#: ../qml/pages/settings/InfoKeys.qml:131
-#: ../qml/pages/settings/git/ImportGitClone.qml:54
-msgid "Yes"
-msgstr ""
-
 #: ../qml/pages/settings/ImportZip.qml:75
 msgid "Password store import failed !"
 msgstr ""
 
 #: ../qml/pages/settings/ImportZip.qml:84
-#: ../qml/pages/settings/git/ImportGitClone.qml:76
+#: ../qml/pages/settings/git/ImportGitClone.qml:77
 msgid "Password store sucessfully imported !"
 msgstr ""
 
@@ -142,32 +171,32 @@ msgstr ""
 msgid "Zip Password Store Import"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:48
+#: ../qml/pages/settings/InfoKeys.qml:56
 msgid "Key ID :"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:82
+#: ../qml/pages/settings/InfoKeys.qml:90
 msgid "Users IDs : "
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:108
+#: ../qml/pages/settings/InfoKeys.qml:117
 msgid "Delete this key"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:130
-msgid "You're are about to delete<br>%1<br>Continue ?"
+#: ../qml/pages/settings/InfoKeys.qml:139
+msgid "You're are about to delete<br>%1<br>.Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:148
+#: ../qml/pages/settings/InfoKeys.qml:153
 msgid "Key removal failed !"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:157
+#: ../qml/pages/settings/InfoKeys.qml:162
 msgid "Key successfully deleted !"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:177
-msgid "Info Keys"
+#: ../qml/pages/settings/InfoKeys.qml:174
+msgid "An Error occured getting GPG keys !"
 msgstr ""
 
 #: ../qml/pages/settings/Settings.qml:23
@@ -194,7 +223,7 @@ msgstr ""
 msgid "Import a Password Store Zip"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:62
+#: ../qml/pages/settings/Settings.qml:67
 msgid "Warning: importing delete any exiting Password Store"
 msgstr ""
 
@@ -212,16 +241,16 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: ../qml/pages/settings/git/ImportGitClone.qml:53
+#: ../qml/pages/settings/git/ImportGitClone.qml:54
 msgid ""
 "Importing a git repo will delete<br>any existing password store!"
 "<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/git/ImportGitClone.qml:67
+#: ../qml/pages/settings/git/ImportGitClone.qml:68
 msgid "An error occured during git clone !"
 msgstr ""
 
-#: ../qml/pages/settings/git/ImportGitClone.qml:88
+#: ../qml/pages/settings/git/ImportGitClone.qml:89
 msgid "Git Clone Import"
 msgstr ""

qml/pages/Info.qml

@@ -1,8 +1,8 @@
 import "../components"
 import Lomiri.Components 1.3
 import QtQuick 2.4
-import "headers"
 import Utils 1.0
+import "headers"
 
 Page {
     id: infoPage

qml/pages/PasswordList.qml

@@ -26,17 +26,39 @@ Page {
         });
     }
 
-    Rectangle {
+    Column {
         anchors.top: passwordListHeader.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
-        visible: folderModel.count == 0
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+        }
 
         Text {
-            text: i18n.tr("No password found<br>You can import a password store by cloning or importing a zip in the settings")
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
+            text: i18n.tr("No password found")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+        }
+
+        Text {
+            text: i18n.tr("You can import a password store by cloning or")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text {
+            text: i18n.tr("importing a password store zip in the settings")
+            width: parent.width
             horizontalAlignment: Text.AlignHCenter
         }
 

qml/pages/settings/DeleteRepo.qml

@@ -0,0 +1,92 @@
+import "../../components"
+import "../../dialogs"
+import "../headers"
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Pass 1.0
+import QtQuick 2.4
+
+Page {
+    id: deleteRepoPage
+
+    Component.onCompleted: {
+        Pass.deletePasswordStoreSucceed.connect(function(keys_info) {
+            PopupUtils.open(deleteRepoPagePageDeleteSuccess);
+        });
+        Pass.deletePasswordStoreFailed.connect(function(message) {
+            PopupUtils.open(deleteRepoPagePageDeleteError);
+        });
+    }
+
+    Column {
+        id: deleteRepoPageListView
+
+        anchors.top: deleteRepoPageHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+        spacing: units.gu(1)
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+        }
+
+        Button {
+            id: buttonDeleteKey
+
+            width: parent.width
+            text: i18n.tr("Delete Password Store")
+            color: theme.palette.normal.negative
+            onClicked: {
+                PopupUtils.open(deleteRepoPagePageDeleteValidation, deleteRepoPage);
+            }
+        }
+
+    }
+
+    Component {
+        id: deleteRepoPagePageDeleteValidation
+
+        SimpleValidationDialog {
+            text: i18n.tr("You're are about to delete<br>the current Password Store.<br>Continue ?")
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
+            onValidated: {
+                var status = Pass.deletePasswordStore();
+            }
+        }
+
+    }
+
+    Component {
+        id: deleteRepoPagePageDeleteError
+
+        ErrorDialog {
+            textError: i18n.tr("Password Store removal failed !")
+        }
+
+    }
+
+    Component {
+        id: deleteRepoPagePageDeleteSuccess
+
+        SuccessDialog {
+            textSuccess: i18n.tr("Password Store deleted !")
+            onDialogClosed: {
+                pageStack.pop();
+                pageStack.pop();
+            }
+        }
+
+    }
+
+    header: StackHeader {
+        id: deleteRepoPageHeader
+
+        title: i18n.tr('Info Keys')
+    }
+
+}

qml/pages/settings/InfoKeys.qml

@@ -9,15 +9,21 @@ import QtQuick 2.4
 Page {
     id: infoKeysPage
 
-    property string currentKey
+    property QtObject currentKey
 
     Component.onCompleted: {
-        Pass.onGetAllGPGKeysSucceed.connect(function(keys_info) {
+        Pass.getAllGPGKeysSucceed.connect(function(keys_info) {
             infoKeysListView.model = keys_info;
         });
         Pass.getAllGPGKeysFailed.connect(function(message) {
             PopupUtils.open(infoKeysPageGetAllError);
         });
+        Pass.deleteGPGKeySucceed.connect(function(keys_info) {
+            PopupUtils.open(infoKeysPageDeleteSuccess);
+        });
+        Pass.deleteGPGKeyFailed.connect(function(message) {
+            PopupUtils.open(infoKeysPageDeleteError);
+        });
         Pass.getAllGPGKeys();
     }
 
@@ -28,6 +34,8 @@ Page {
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
 
         delegate: Grid {
             columns: 1
@@ -105,10 +113,11 @@ Page {
             Button {
                 id: buttonDeleteKey
 
+                width: parent.width
                 text: i18n.tr("Delete this key")
                 color: theme.palette.normal.negative
                 onClicked: {
-                    infoKeysPage.currentKey = model.modelData.uid;
+                    infoKeysPage.currentKey = model.modelData;
                     PopupUtils.open(infoKeysPageDeleteValidation, infoKeysPage);
                 }
             }
@@ -127,15 +136,11 @@ Page {
         id: infoKeysPageDeleteValidation
 
         SimpleValidationDialog {
-            text: i18n.tr("You're are about to delete<br>%1<br>Continue ?").arg(infoKeysPage.currentKey)
+            text: i18n.tr("You're are about to delete<br>%1<br>.Continue ?").arg(infoKeysPage.currentKey.uid)
             continueText: i18n.tr("Yes")
             continueColor: theme.palette.normal.negative
             onValidated: {
                 var status = Pass.deleteGPGKey(infoKeysPage.currentKey);
-                if (status)
-                    PopupUtils.open(infoKeysPageDeleteSuccess);
-                else
-                    PopupUtils.open(infoKeysPageDeleteError);
             }
         }
 
@@ -166,7 +171,7 @@ Page {
         id: infoKeysPageGetAllError
 
         ErrorDialog {
-            textError: i18n.tr("Decryption failed !")
+            textError: i18n.tr("An Error occured getting GPG keys !")
         }
 
     }

qml/pages/settings/Settings.qml

@@ -53,6 +53,11 @@ Page {
             text: i18n.tr('Import a Password Store Zip')
         }
 
+        PageStackLink {
+            page: Qt.resolvedUrl("DeleteRepo.qml")
+            text: i18n.tr('Delete Password Store')
+        }
+
         Text {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter

qml/pages/settings/git/GitCloneHttp.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.4
 import Git 1.0
 import Lomiri.Components 1.3
 import Pass 1.0
+import QtQuick 2.4
 
 Column {
     width: parent.width

qml/pages/settings/git/GitCloneHttpAuth.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.4
 import Git 1.0
 import Lomiri.Components 1.3
 import Pass 1.0
+import QtQuick 2.4
 
 Column {
     anchors.top: parent.fill

qml/pages/settings/git/GitModeOptionSelector.qml

@@ -1,31 +1,38 @@
-import QtQuick 2.4
 import Git 1.0
 import Lomiri.Components 1.3
 import Lomiri.Components.Pickers 1.3
+import QtQuick 2.4
 
-OptionSelector  {
+OptionSelector {
     id: combo
-    width : parent.width
+
+    width: parent.width
     model: ["HTTP", "HTTP AUTH"]
     onDelegateClicked: function(i) {
-        if(i===0) {
-            timer.setTimeout(function(){importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml") }, 500);
-        } else if (i===1) {
-           timer.setTimeout( function(){importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttpAuth.qml") }, 500);
-        }
+        if (i === 0)
+            timer.setTimeout(function() {
+            importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml");
+        }, 500);
+        else if (i === 1)
+            timer.setTimeout(function() {
+            importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttpAuth.qml");
+        }, 500);
     }
 
     Timer {
         id: timer
+
         function setTimeout(cb, delayTime) {
             timer.interval = delayTime;
             timer.repeat = false;
             timer.triggered.connect(cb);
-            timer.triggered.connect(function release () {
+            timer.triggered.connect(function release() {
                 timer.triggered.disconnect(cb); // This is important
                 timer.triggered.disconnect(release); // This is important as well
             });
             timer.start();
         }
+
     }
+
 }

qml/pages/settings/git/ImportGitClone.qml

@@ -11,14 +11,14 @@ Page {
     id: importGitClonePage
 
     Component.onCompleted: {
-        Git.onCloneSucceed.connect(function() {
+        Git.cloneSucceed.connect(function() {
             PopupUtils.open(dialogGitCloneSuccess);
         });
-        Git.onCloneFailed.connect(function() {
+        Git.cloneFailed.connect(function() {
             PopupUtils.open(dialogGitCloneError);
         });
         PopupUtils.open(importGitCloneValidation, importGitClonePage);
-        importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml")
+        importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml");
     }
 
     Column {
@@ -44,6 +44,7 @@ Page {
 
             width: parent.width
         }
+
     }
 
     Component {