Bump version 0.0.4

Added Dutch translation

.astylerc

@@ -5,8 +5,7 @@ suffix=none
 --align-reference=name
 --convert-tabs
 --attach-namespaces
---max-code-length=100
---max-instatement-indent=120
+--max-code-length=120
 --pad-header
 --pad-oper
 --lineend=linux

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "libs/rnp"]
+	path = libs/rnp
+	url = https://github.com/rnpgp/rnp
+[submodule "libs/botan"]
+	path = libs/botan
+	url = https://github.com/randombit/botan

CHANGELOG.md

@@ -0,0 +1,29 @@
+# 0.0.4
+- Fix white screen issue on 24.04
+- Add search functionality
+- Some minor fixes and improvements
+
+# 0.0.3
+- Port app to Focal
+- Improve UI :
+  * Follow human interface guidelines
+  * Fix various components color to work with dark theme 
+- Rewrite of Pass Plugin:
+  * Move from GPGMe to RNP for GPG operations due to issues running GPG agent in a confined app
+  * Improve multithreading code for GPG operations
+- Add Git HTTP and HTTP AUTH clone for password store import feature
+- Add delete password store feature
+
+# 0.0.2 
+- Added French by Anne17  and Reda 
+- Added Catalan by Joan CiberSheep 
+- Added Spanish by Advocatux and Reda 
+
+Thanks to all the translators !
+
+# 0.0.1 
+- Import of gpg keys via file
+- Suppression of gpg keys
+- Import of password via a password store zip
+- Password decryption
+- Password copy to clipboard

CMakeLists.txt

@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.5.1)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
 execute_process(
         COMMAND dpkg-architecture -qDEB_HOST_ARCH
         OUTPUT_VARIABLE CLICK_ARCH
@@ -28,11 +32,30 @@ set(PROJECT_NAME "UTPass")
 set(FULL_PROJECT_NAME "utpass.qrouland")
 set(CMAKE_INSTALL_PREFIX /)
 set(DATA_DIR /)
-# set(BIN_DIR ${DATA_DIR}lib/bin)
+
 set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop)
 
-add_executable(${PROJECT_NAME} main.cpp)
-qt5_use_modules(${PROJECT_NAME} Gui Qml Quick)
+if(NOT TESTS_PATH)
+    set(TESTS_PATH "./tests")
+endif()
+
+if(TESTS_RUNNER)
+    configure_file(tests.in.cpp tests.cpp)
+    add_executable(${PROJECT_NAME} tests.cpp)
+else()
+    add_executable(${PROJECT_NAME} main.cpp)
+endif()
+
+qt5_use_modules(${PROJECT_NAME} Gui Qml Quick QuickTest)
+
+set_source_files_properties(qml/singletons/GitSettings.qml PROPERTIES
+    QT_QML_SINGLETON_TYPE TRUE
+)
+
+if(TESTS_RUNNER)
+    qt5_use_modules(${PROJECT_NAME} QuickTest)
+endif()
+
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 
@@ -41,7 +64,6 @@ configure_file(${CMAKE_CURRENT_BINARY_DIR}/manifest.json ${CMAKE_CURRENT_BINARY_
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest_.json DESTINATION ${DATA_DIR})
 
-#install(DIRECTORY desktop DESTINATION ${DATA_DIR})
 
 install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
 install(FILES ${PROJECT_NAME}.contenthub DESTINATION ${DATA_DIR})
@@ -49,14 +71,6 @@ install(FILES LICENSE DESTINATION ${DATA_DIR})
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
 install(DIRECTORY assets DESTINATION ${DATA_DIR})
 
-# file(GLOB_RECURSE BIN_FILES
-#         "/usr/bin/gpg*"
-# )
-# install(
-#         FILES ${BIN_FILES}
-#         PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-#         DESTINATION ${BIN_DIR}
-# )
 
 # Translations
 file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.qml qml/*.js)
@@ -81,5 +95,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DAT
 
 add_subdirectory(po)
 add_subdirectory(plugins)
+if(TESTS_RUNNER)
+    add_subdirectory(tests/plugins)
+endif()
+
 
 add_custom_target(${PROJECT_NAME}_FILES ALL SOURCES ${PROJECT_SRC_FILES})

README.md

@@ -1,18 +1,14 @@
 # UTPass
 
-A Ubuntu Touch password management app aiming to be compatible with [ZX2C4’s pass command line application](https://www.passwordstore.org/) the standard unix password manager.
+A Ubuntu Touch password management app aiming to be read-only compatible with [ZX2C4’s pass command line application](https://www.passwordstore.org/) the standard unix password manager.
 
 ## Installation
 
-UTPass is avalaible on the [OpenStore](open-store.io)
+UTPass is avalaible on the [OpenStore](https://open-store.io)
 
 [![OpenStore](https://open-store.io/badges/en_US.png)](https://open-store.io/app/utpass.qrouland)
 
 
-## Features
-
-The goal is to be closest possible of the features offer by [ZX2C4’s pass command line application](https://www.passwordstore.org/). 
-See [Features wiki page](https://taiga.rdrive.ovh/project/utpass/wiki/contributing) for details.
 
 ## Export/Import
 
@@ -20,22 +16,24 @@ Assuming that there are already passwords in another device using [ZX2C4’s pas
 
 Export gpg private keys in order to decrypt passwords:
 ```
-gpg --output keys.gpg --export-secret-keys
+gpg --output keys.gpg --export-secret-keys <key>
 ```
 
-Export passwords, assuming they reside in *.password-store* folder:
+If your password store is already hosted in a Git repository with HTTP (SSH is not supported yet), you can clone your password store directly from the app. Otherwise, follow these steps to export it as a ZIP file for importing.
+
+Export passwords to a ZIP archive, assuming they reside in the *.password-store* folder:
 ```
 zip passwords.zip -r .password-store/
 ```
 
-Both files have the correct format for UTPass to import them and work as intended. It is highly recommended to remove them after imported to **UTPass**.
+Files have the correct format for UTPass to import them and work as intended. It is highly recommended to remove them after imported to **UTPass**.
 
 
 ## Build & Tests
 
 See [Build & Tests wiki page](https://github.com/QRouland/UTPass/wiki/Build-&-Tests)
 
-## Contributing & Issues
+## Contributing & Translation
 
 See [Contributing wiki page](https://github.com/QRouland/UTPass/wiki/Contributing)
 
@@ -44,11 +42,9 @@ See [Contributing wiki page](https://github.com/QRouland/UTPass/wiki/Contributin
 
 Some useful links related to UTPass development :
 * [Ubports](https://ubports.com/) : Ubuntu Touch Community
-* [ZX2C4’s pass command line application](https://www.passwordstore.org/) : the standard unix password manager.
+* [ZX2C4’s pass command line application](https://www.passwordstore.org/) : The standard unix password manager.
 * [Clickable](https://github.com/bhdouglass/clickable) : Compile, build, and deploy Ubuntu Touch click packages
-* [GnuPG](https://gnupg.org/): The GNU Privacy Guard
-* [Gpgme](https://www.gnupg.org/software/gpgme/index.html) : GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications
-
+* [Rnp](https://github.com/rnpgp/rnp) : High performance C++ OpenPGP library used by Mozilla Thunderbird 
 
 ## License
 

clickable.yaml

@@ -4,25 +4,42 @@ kill: UTPass
 
 scripts:
   style: >-
-    echo 'Astyle :' && astyle --options=.astylerc main.cpp && astyle
-    --options=.astylerc --recursive 'plugins/*.cpp,*.h' && echo 'QmlFmt :' &&
-    qmlfmt -l tests && qmlfmt -w tests && qmlfmt -l qml && qmlfmt -w qml
+    echo 'Running Astyle :' && astyle --options=.astylerc --recursive '*.cpp,*.h' --exclude=build --exclude=libs && echo 'Running QmlFormat' && find . -name "*.qml" -exec qmlformat -i {} \; && echo 'Success'
+
 
 dependencies_target:
-- libgpgmepp-dev
-- libgpgme-dev
 - libgit2-dev
 - libquazip5-dev
-- gpg
+- libjson-c-dev
+
+libraries:
+  botan:
+      builder: custom
+      make_jobs: 2
+      dependencies_host:
+      - python
+      prebuild:
+      - $SRC_DIR/configure.py --cpu $ARCH --prefix $INSTALL_DIR --with-build-dir $BUILD_DIR
+      build:
+      - make
+      - make install
+  rnp:
+    builder: cmake
+    make_jobs: 2
+    dependencies_target:
+    - libbz2-dev
+    - zlib1g-dev
+    - libjson-c-dev
+    build_args: -DBUILD_TESTING=off -DCRYPTO_BACKEND=botan
+
 
 install_lib:
-- "libgpg-error.so.0.28.0"
-- "libassuan.so"
-- "libgpgme.so"
-- "libgpgmepp.so"
-- "libqgpgme.so.7"
-- "libgit2.so"
-- "libquazip5.so"
+- "libgit2.so*"
+- "libmbedtls.so*"
+- "libmbedx509.so*"
+- "libmbedcrypto.so*"
+- "libhttp_parser.so*"
+- "libssh2.so*"
+- "libquazip5.so*"
+- "libjson-c.so*"
 
-install_bin:
-- "gpg"

cmake/FindJSON-C.cmake

@@ -0,0 +1,127 @@
+# Copyright (c) 2018, 2024 Ribose Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+#.rst:
+# FindJSON-C
+# -----------
+#
+# Find the json-c library.
+#
+# IMPORTED Targets
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines :prop_tgt:`IMPORTED` targets:
+#
+# ``JSON-C::JSON-C``
+#   The json-c library, if found.
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines the following variables:
+#
+# ::
+#
+#   JSON-C_FOUND          - true if the headers and library were found
+#   JSON-C_INCLUDE_DIRS   - where to find headers
+#   JSON-C_LIBRARIES      - list of libraries to link
+#   JSON-C_VERSION        - library version that was found, if any
+
+# use pkg-config to get the directories and then use these values
+# in the find_path() and find_library() calls
+find_package(PkgConfig)
+pkg_check_modules(PC_JSON-C QUIET json-c)
+
+# RHEL-based systems may have json-c12
+if (NOT PC_JSON-C_FOUND)
+  pkg_check_modules(PC_JSON-C QUIET json-c12)
+endif()
+
+# ..or even json-c13, accompanied by non-develop json-c (RHEL 8 ubi)
+if (NOT PC_JSON-C_FOUND)
+  pkg_check_modules(PC_JSON-C QUIET json-c13)
+endif()
+
+# find the headers
+find_path(JSON-C_INCLUDE_DIR
+  NAMES json_c_version.h
+  HINTS
+    ${PC_JSON-C_INCLUDEDIR}
+    ${PC_JSON-C_INCLUDE_DIRS}
+  PATH_SUFFIXES json-c json-c12 json-c13
+)
+
+# find the library
+find_library(JSON-C_LIBRARY
+  NAMES json-c libjson-c json-c12 libjson-c12 json-c13 libjson-c13
+  HINTS
+    ${PC_JSON-C_LIBDIR}
+    ${PC_JSON-C_LIBRARY_DIRS}
+)
+
+# determine the version
+if(PC_JSON-C_VERSION)
+    set(JSON-C_VERSION ${PC_JSON-C_VERSION})
+elseif(JSON-C_INCLUDE_DIR AND EXISTS "${JSON-C_INCLUDE_DIR}/json_c_version.h")
+    file(STRINGS "${JSON-C_INCLUDE_DIR}/json_c_version.h" _json-c_version_h
+      REGEX "^#define[\t ]+JSON_C_VERSION[\t ]+\"[^\"]*\"$")
+
+    string(REGEX REPLACE ".*#define[\t ]+JSON_C_VERSION[\t ]+\"([^\"]*)\".*"
+      "\\1" _json-c_version_str "${_json-c_version_h}")
+    set(JSON-C_VERSION "${_json-c_version_str}"
+                       CACHE INTERNAL "The version of json-c which was detected")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JSON-C
+  REQUIRED_VARS JSON-C_LIBRARY JSON-C_INCLUDE_DIR JSON-C_VERSION
+  VERSION_VAR JSON-C_VERSION
+)
+
+if (JSON-C_FOUND)
+  set(JSON-C_INCLUDE_DIRS ${JSON-C_INCLUDE_DIR} ${PC_JSON-C_INCLUDE_DIRS})
+  set(JSON-C_LIBRARIES ${JSON-C_LIBRARY})
+endif()
+
+if (JSON-C_FOUND AND NOT TARGET JSON-C::JSON-C)
+  # create the new library target
+  add_library(JSON-C::JSON-C UNKNOWN IMPORTED)
+  # set the required include dirs for the target
+  if (JSON-C_INCLUDE_DIRS)
+    set_target_properties(JSON-C::JSON-C
+      PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${JSON-C_INCLUDE_DIRS}"
+    )
+  endif()
+  # set the required libraries for the target
+  if (EXISTS "${JSON-C_LIBRARY}")
+    set_target_properties(JSON-C::JSON-C
+      PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${JSON-C_LIBRARY}"
+    )
+  endif()
+endif()
+
+mark_as_advanced(JSON-C_INCLUDE_DIR JSON-C_LIBRARY)

manifest.json.in

@@ -10,7 +10,7 @@
             "content-hub": "UTPass.contenthub"
         }
     },
-    "version": "0.0.3-dev",
+    "version": "0.0.4",
     "maintainer": "Quentin Rouland <quentin@qrouland.com>",
     "framework" : "ubuntu-sdk-20.04"
 }

plugins/CMakeLists.txt

@@ -1,2 +1,3 @@
+add_subdirectory(Git)
 add_subdirectory(Pass)
 add_subdirectory(Utils)

plugins/Git/CMakeLists.txt

@@ -0,0 +1,39 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(PLUGIN "Git")
+
+set(
+        SRC
+        plugin.cpp
+        git.cpp
+        utils.h
+        error.h
+        jobs/clonejob.cpp
+        jobs/gitjob.cpp
+)
+
+set(CMAKE_AUTOMOC ON)
+
+execute_process(
+        COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+        OUTPUT_VARIABLE ARCH_TRIPLET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+if(ARCH_TRIPLET STREQUAL "")
+    set(ARCH_TRIPLET x86_64-linux-gnu)
+endif()
+
+add_library(${PLUGIN} MODULE ${SRC})
+set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
+qt5_use_modules(${PLUGIN} Qml Quick DBus)
+
+
+add_library(libgit2 SHARED IMPORTED)
+set_property(TARGET libgit2 PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgit2.so")
+
+target_link_libraries(${PLUGIN} libgit2)
+
+
+set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
+install(TARGETS ${PLUGIN} DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN}/)
+install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN}/)

plugins/Git/error.h

@@ -0,0 +1,55 @@
+// error.h
+#ifndef ERROR_H
+#define ERROR_H
+
+#include <string>
+extern "C" {
+#include <git2.h>
+}
+
+// Enum for Git-specific errors (e.g., from git_clone)
+enum class GitCloneErrorCode {
+    Successful = 0,
+    UnexpectedError,  ///< Unknown or unexpected error
+    InvalidUrl,           ///< Malformed URL error
+    NoUsername,           ///< Missing username error
+    AuthentificationError,   ///< Authentification error
+    UrlTypeDoNotMatchCreds,
+};
+
+/**
+* Convert a git_error to a GitCloneErrorCode
+* @param error A pointer to the git_error structure
+* @return Corresponding GitCloneErrorCode integer value
+*/
+inline GitCloneErrorCode gitErrorToGitCloneErrorCode(const git_error* error)
+{
+    if (error == nullptr) {
+        return GitCloneErrorCode::Successful;  ///< Default error if null
+    }
+
+    if (error->message != nullptr) {
+        if (std::string(error->message) == "malformed URL") {
+            return GitCloneErrorCode::InvalidUrl;  ///< Invalid URL error
+        }
+        if (std::string(error->message) == "remote requested authentication but did not negotiate mechanisms") {
+            return GitCloneErrorCode::AuthentificationError;  ///< Invalid URL error
+        }
+    }
+
+    return GitCloneErrorCode::UnexpectedError;  ///< Default to UnexpectedError
+}
+
+/**
+ * Maps the given GitCloneErrorCode to its corresponding integer.
+ *
+ * @param error The GitCloneErrorCode value to convert.
+ * @return Corresponding GitCloneErrorCode integer value.
+ */
+constexpr int code_err(GitCloneErrorCode err)
+{
+    return static_cast<int>(err);
+}
+
+
+#endif // ERROR_H

plugins/Git/git.cpp

@@ -0,0 +1,105 @@
+#include "error.h"
+#include <QUrl>
+#include <QtCore/QDir>
+#include <QDebug>
+#include <QStandardPaths>
+extern "C" {
+#include <git2.h>
+}
+
+#include "git.h"
+#include "utils.h"
+#include "jobs/clonejob.h"
+#include "jobs/gitjob.h"
+
+Git::Git():
+    m_sem(std::unique_ptr<QSemaphore>(new QSemaphore(1))),
+    m_ssh_homedir (QStandardPaths::writableLocation(
+                       QStandardPaths::AppDataLocation).append("/.ssh"))
+{
+    qDebug() << "[Git] SSH Home is " << m_ssh_homedir.absolutePath();
+    QDir m_ssh_homedir(this->m_ssh_homedir);
+    if (!m_ssh_homedir.exists()) {
+        m_ssh_homedir.mkpath(".");
+    }
+    git_libgit2_init();
+}
+
+Git::~Git()
+{
+    git_libgit2_shutdown();
+}
+
+
+bool Git::clone(QString url, QString path, cred_type mode)
+{
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qWarning() << "[Git] Can acquire git semaphore a command is already running ";
+        return false;
+    }
+    auto v =  overload {
+        [](const HTTP & x)        { UNUSED(x); return "HTTP"; },
+        [](const HTTPUserPass & x)    { UNUSED(x); return "HTTPAuth"; },
+        [](const SSHKey & x)      { UNUSED(x); return "SSHKey"; },
+    };
+    qDebug() << "[Git] Creating clone Job  " << url << " " << path << " " << std::visit(v, mode);
+    CloneJob *clone_job = new CloneJob(url, path, mode);
+    connect(clone_job, &CloneJob::resultReady, this, &Git::cloneResult);
+    connect(clone_job, &CloneJob::finished, clone_job, &QObject::deleteLater);
+    clone_job->start();
+    return true;
+}
+
+bool Git::cloneHttp(QString url, QString path)
+{
+    qInfo() << "[Git] Call clone command Http " << url << " " << path;
+    HTTP mode = {};
+    return this->clone(url, path, mode);
+}
+
+bool Git::cloneHttpPass(QString url, QString path, QString pass)
+{
+    qInfo() << "[Git] Call clone command HttpPass " << url << " " << path;
+    HTTPUserPass mode = { pass };
+    return this->clone(url, path, mode);
+}
+
+bool Git::cloneSshKey(QString url, QString path, QString passphrase)
+{
+    qInfo() << "[Git] Call clone command SshKey " << url << " " << path;
+
+    SSHKey mode = { this->pubKeyPath(), this->privKeyPath(), passphrase };
+    return this->clone(url, path, mode);
+}
+
+void Git::cloneResult(const int err_code, const QString message)
+{
+
+    if (err_code == code_err(GitCloneErrorCode::Successful)) {
+        emit cloneSucceed();
+    } else {
+        emit cloneFailed(err_code, message);
+    }
+    this->m_sem->release();
+}
+
+bool Git::importSshKey(QUrl source_path, bool is_private)
+{
+    auto destination_path = is_private ? this->privKeyPath() : this->pubKeyPath();
+
+    QFile source_file(source_path.toLocalFile());
+
+    if (!source_file.exists()) {
+        qWarning() << "[Git] Source file does not exist.";
+        return false;
+    }
+
+    QDir target_dir = QFileInfo(destination_path).absoluteDir();
+    if (!target_dir.exists()) {
+        if (!target_dir.mkpath(".")) {
+            qWarning() << "[Git] Failed to create target directory.";
+            return false;
+        }
+    }
+    return source_file.copy(destination_path);
+}

plugins/Git/git.h

@@ -0,0 +1,150 @@
+#ifndef GIT_H
+#define GIT_H
+
+#include "error.h"
+#include "jobs/gitjob.h"
+#include <QUrl>
+#include <QObject>
+#include <QSemaphore>
+#include <QtCore/QDir>
+
+/**
+ * @class Git
+ * @brief A class that provides Git functionality for cloning and updating repositories.
+ *
+ * The `Git` class provides a set of methods to do Git operation on remote URLs.
+ */
+class Git : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString privKey READ pubKeyPath)
+    Q_PROPERTY(QString pubKey  READ privKeyPath)
+
+private slots:
+    /**
+     * @brief Slot that handles the result of a cloning operation.
+     *
+     * This slot is connected to the result of the cloning operation and is triggered when the cloning
+     * process finishes. It emits the appropriate signal based on whether the clone operation succeeded
+     * or failed.
+     *
+     * @param err A err_code indicating whether an error occurred during cloning.
+     * @param err An error message.
+     */
+    void cloneResult(const int err_code, const QString message);
+
+signals:
+    /**
+     * @brief Signal emitted when the cloning operation succeeds.
+     *
+     * This signal is emitted when the Git repository is successfully cloned.
+     */
+    void cloneSucceed();
+
+    /**
+     * @brief Signal emitted when the cloning operation fails.
+     *
+     * @param err_code The error code
+     * @param msg The deffautl error message from libgit
+     * This signal is emitted when an error occurs during the cloning operation.
+     */
+    void cloneFailed(int err_code, QString msg);
+
+private:
+    std::unique_ptr<QSemaphore> m_sem; /**< Semaphore for managing concurrent operations. */
+    QDir m_ssh_homedir; /**< Directory that contains the SSH keys (public and private). */
+
+    /**
+     * @brief Clones a repository from a specified URL.
+     *
+     * This private method initiates the cloning job. It sets up the repository cloning process based on
+     * the specified URL, destination path, and cloning mode (HTTP, HTTP_AUTH or SSH).
+     *
+     * @param url The URL of the Git repository to clone.
+     * @param path The destination path for the cloned repository.
+     * @param mode The cloning mode, such as HTTP or SSH (represented as `cred_type`).
+     * @return `true` if the cloning process was successful, `false` otherwise.
+     */
+    bool clone(QString url, QString path, cred_type mode);
+
+protected:
+    /**
+     * @brief Get the path to the public keyring.
+     *
+     * @return The file path to the public key.
+     */
+    QString pubKeyPath()
+    {
+        return this->m_ssh_homedir.filePath("id_rsa.pub");
+    }
+
+    /**
+     * @brief Get the path to the secret keyring.
+     *
+     * @return The file path to the private key.
+     */
+    QString privKeyPath()
+    {
+        return this->m_ssh_homedir.filePath("id_rsa");
+    }
+
+public:
+    /**
+     * @brief Constructor for the Git class.
+     *
+     * Initializes the `Git` class.
+     */
+    Git();
+
+    /**
+     * @brief Destructor for the Git class.
+     *
+     * Cleans up any resources used by the `Git` class.
+     */
+    ~Git() override;
+
+
+    Q_INVOKABLE bool importSshKey(QUrl source_path, bool is_private);
+
+    /**
+     * @brief Clones a repository over HTTP.
+     *
+     * This method clones a Git repository from the specified HTTP URL and saves it to the given destination path.
+     *
+     * @param url The HTTP URL of the Git repository to clone.
+     * @param path The destination path for the cloned repository.
+     * @return `true` if the clone operation was successfully started, `false` otherwise.
+     */
+    Q_INVOKABLE bool cloneHttp(QString url, QString path);
+
+    /**
+     * @brief Clones a repository over HTTP with a password for authentication.
+     *
+     * This method clones a Git repository from the specified HTTP URL using the provided password for authentication,
+     * and saves it to the given destination path.
+     *
+     * @param url The HTTP URL of the Git repository to clone.
+     * @param path The destination path for the cloned repository.
+     * @param pass The password used for HTTP authentication.
+     * @return `true` if the clone job operation was successfully started, `false` otherwise.
+     */
+    Q_INVOKABLE bool cloneHttpPass(QString url, QString path, QString pass);
+
+    /**
+     * @brief Clones a repository over SSH with a key for authentication.
+     *
+     * This method clones a Git repository from the specified ssh URL using the provided password for authentication,
+     * and saves it to the given destination path.
+     *
+     * @param url The HTTP URL of the Git repository to clone.
+     * @param path The destination path for the cloned repository.
+     * @param passphrase The passphrase used for SSH authentication.
+     * @return `true` if the clone job operation was successfully started, `false` otherwise.
+     */
+    Q_INVOKABLE bool cloneSshKey(QString url, QString path, QString passphrase);
+
+    // Q_INVOKABLE bool update(QUrl url, QString path);
+    // ....
+};
+
+#endif

plugins/Git/jobs/clonejob.cpp

@@ -0,0 +1,111 @@
+#include <QStandardPaths>
+#include <QDir>
+#include <QUrl>
+#include <QDebug>
+#include <QObject>
+#include <memory>
+#include <type_traits>
+extern "C" {
+#include <git2.h>
+}
+
+#include "clonejob.h"
+#include "../error.h"
+
+CloneJob::CloneJob(QString url, QString path, cred_type cred):
+    GitJob(cred),
+    m_url(url),
+    m_path(path)
+{
+    this->setObjectName("CloneJob");
+}
+
+void CloneJob::run()
+{
+    auto tmp_dir = this->cloneSetup();
+    const auto [errorCode, errorMessage] = this->clone(m_url, tmp_dir.absolutePath(), this->m_cred, this->credentialsCB);
+
+    if (errorCode == GitCloneErrorCode::Successful) {
+        this->moveToDestination(tmp_dir, this->m_path);
+    }
+
+    this->cloneCleanUp(tmp_dir);
+    emit resultReady(code_err(errorCode), errorMessage);
+}
+
+QDir CloneJob::cloneSetup()
+{
+    QDir tmp_dir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation).append("/clone"));
+
+    tmp_dir.removeRecursively();  // Clean the directory before use
+    qDebug() << "[CloneJob] Temp dir path is" << tmp_dir.absolutePath();
+
+    return tmp_dir;
+}
+
+bool CloneJob::cloneCleanUp(QDir tmp_dir)
+{
+    if (!tmp_dir.removeRecursively()) {
+        qWarning() << "[CloneJob] Failed to clean up temporary directory:" << tmp_dir.absolutePath();
+        return false;
+    }
+    return true;
+}
+
+bool CloneJob::moveToDestination(QDir tmp_dir, const QString& path)
+{
+    qDebug() << "[CloneJob] Removing existing destination:" << path;
+
+    QDir destination_dir(path);
+    destination_dir.removeRecursively();  // Clean the destination directory
+
+    qDebug() << "[CloneJob] Moving cloned content to destination dir";
+
+    if (!QDir().rename(tmp_dir.absolutePath(), destination_dir.absolutePath())) {
+        qWarning() << "[CloneJob] Failed to move directory from" << tmp_dir.absolutePath() << "to" <<
+                   destination_dir.absolutePath();
+        return false;
+    }
+
+    return true;
+}
+
+const QPair<GitCloneErrorCode, QString> CloneJob::clone(QString url, QString path, cred_type cred,
+        git_cred_acquire_cb cb)
+{
+    git_repository *repo = nullptr;  // Use nullptr for type safety
+    git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
+    PayloadCB payload(false, cred);
+
+    opts.fetch_opts.callbacks.credentials = cb;
+    opts.fetch_opts.callbacks.payload = &payload;
+
+    int ret = git_clone(&repo, url.toLocal8Bit().data(), path.toLocal8Bit().data(), &opts);
+
+    // Map the application specific cb errors if any
+    if (ret == GIT_EUSER) {
+        if (payload.err == ErrorCodeCB::NoUsername)
+            return {GitCloneErrorCode::NoUsername, "no username provided in URL"};
+        if (payload.err == ErrorCodeCB::InvalidCreds)
+            return {GitCloneErrorCode::AuthentificationError, "authentification error"};
+        if (payload.err == ErrorCodeCB::UrlTypeDoNotMatchCreds)
+            return {GitCloneErrorCode::UrlTypeDoNotMatchCreds, "invalid creds types for provided url"};
+        return {GitCloneErrorCode::UnexpectedError, "unexcepted error occured"};
+    }
+
+    const git_error* err = git_error_last();  // Retrieve the last error git error
+
+    // Log error details for debugging
+    if (err) {
+        qDebug() << "[CloneJob] Error class:" << err->klass;
+        qDebug() << "[CloneJob] Error message:" << err->message;
+    }
+
+    // Check if the repository was successfully created and free it
+    if (repo) {
+        git_repository_free(repo);
+    }
+
+    // Return the error code mapped from git_error_last
+    return { gitErrorToGitCloneErrorCode(err), err ? QString::fromUtf8(err->message) : "success"};
+}

plugins/Git/jobs/clonejob.h

@@ -0,0 +1,106 @@
+#ifndef CLONEJOB_H
+#define CLONEJOB_H
+
+#include <QDir>
+extern "C" {
+#include <git2.h>
+}
+#include "gitjob.h"
+#include "../error.h"
+
+/**
+ * @class CloneJob
+ * @brief A class to handle cloning Git repositories in a separate thread.
+ *
+ */
+class CloneJob : public GitJob
+{
+    Q_OBJECT
+
+    /**
+     * @brief The main function that performs the cloning operation.
+     *
+     * Handles the process of cloning a repository from the specified URL
+     * to the target path.
+     */
+    void run() override;
+
+signals:
+    /**
+    * @brief Signal emitted when the cloning operation is complete.
+    *
+    * This signal is emitted once the cloning operation finishes.
+    *
+    * @param err A Git error.
+    */
+    void resultReady(const int err_code, const QString message);
+
+private:
+    QString m_url; ///< The URL of the Git repository to clone.
+    QString m_path; ///< The destination path for the cloned repository.
+
+    /**
+     * @brief Prepares the temporary directory for cloning.
+     *
+     * This method sets up the required directory structure for cloning a repository.
+     *
+     * @return A `QDir` object representing the prepared temporary directory.
+     */
+    static QDir cloneSetup();
+
+    /**
+     * @brief Moves the cloned repository to the specified destination.
+     *
+     * After the repository has been cloned into a temporary directory, this method
+     * moves it to the final destination specified by the user.
+     *
+     * @param path The destination path to move the repository to.
+     * @param tmp_dir The temporary directory where the repository was cloned.
+     * @return `true` if the move was successful, `false` otherwise.
+     */
+    static bool moveToDestination(QDir tmp_dir, const QString& path);
+
+    /**
+     * @brief Tears down the temporary directory after cloning.
+     *
+     * This method is called to clean up the temporary directory after the repository
+     * has been cloned and moved to the final destination. It removes the temporary
+     * directory and all its contents.
+     *
+     * @param tmp_dir The temporary directory to tear down.
+     * @return `true` if the teardown was successful, `false` otherwise.
+     */
+    static bool cloneCleanUp(QDir tmp_dir);
+
+    /**
+     * @brief Clones a repository from a specified URL.
+     *
+     * This method handles the actual cloning process by setting up a temporary
+     * directory, cloning the repository into it, and then moving it to the final
+     * destination. It uses the provided credentials to authenticate the cloning
+     * operation.
+     *
+     * @param url The URL of the Git repository to clone.
+     * @param path The destination path for the cloned repository.
+     * @param cred The credentials to use for the cloning operation.
+     * @param cb The callback function for acquiring credentials during cloning.
+     * @return A Git error, result of the operation.
+     */
+    static const QPair<GitCloneErrorCode, QString> clone(QString url, QString path, cred_type cred, git_cred_acquire_cb cb);
+
+
+public:
+    /**
+     * @brief Constructor for the CloneJob class.
+     *
+     * Initializes the CloneJob with the specified repository URL, destination path,
+     * and credentials.
+     *
+     * @param url The URL of the Git repository to clone.
+     * @param path The destination path where the repository will be cloned.
+     * @param cred The credentials to be used for the cloning process.
+     */
+    CloneJob(QString url, QString path, cred_type cred);
+};
+
+#endif // CLONEJOB_H

plugins/Git/jobs/gitjob.cpp

@@ -0,0 +1,74 @@
+#include <QDebug>
+
+#include "gitjob.h"
+#include "../utils.h"
+
+extern "C" {
+#include <git2.h>
+}
+
+GitJob::GitJob(cred_type cred) :
+    m_cred(cred)
+{
+    git_libgit2_init();
+}
+
+GitJob::~GitJob()
+{
+    git_libgit2_shutdown();
+}
+
+
+
+int GitJob::credentialsCB(git_cred **out, const char *url, const char *username_from_url,
+                          unsigned int allowed_types, void *payload)
+{
+    UNUSED(url);
+    PayloadCB *p = (PayloadCB *)payload;
+
+    if (!username_from_url) { // we required here that the username must be provided directly in url (maybe improve later on)
+        qWarning() << "[GitJob] credentials_cb : no username provided";
+        p->err = ErrorCodeCB::NoUsername;
+        return (int) GIT_EUSER;
+    }
+
+    if (p->called) {
+        qWarning() << "[GitJob] credentials_cb : cb already called, probably invalid creds";
+        p->err = ErrorCodeCB::InvalidCreds;
+        return (int) GIT_EUSER;
+    }
+    p->called = true;
+
+    auto v =  overload {
+        [](const HTTP & x)
+        {
+            UNUSED(x);
+            qDebug() << "[GitJob] credentialsCB : HTTP ";
+            qWarning() << "[GitJob] credentialsCB : callback should never be call for HTTP";
+            return (int) GIT_EUSER;
+        },
+        [allowed_types, &out, &username_from_url, &p](const HTTPUserPass & x)
+        {
+            qDebug() << "[GitJob] credentialsCB : HTTPUserPass ";
+            if (!(allowed_types & GIT_CREDTYPE_USERPASS_PLAINTEXT)) {
+                qWarning() << "[GitJob] credentials_cb : allowed_types is invalid for HTTPUserPass creds";
+                p->err = ErrorCodeCB::UrlTypeDoNotMatchCreds;
+                return (int) GIT_EUSER;
+            }
+            return git_cred_userpass_plaintext_new(out, username_from_url, x.pass.toLocal8Bit().constData());
+        },
+        [allowed_types, &out, &username_from_url, &p](const SSHKey & x)
+        {
+            qDebug() << "[GitJob] credentialsCB : SSHKey ";
+            if (!(allowed_types & GIT_CREDTYPE_SSH_KEY)) {
+                qWarning() << "[GitJob] credentials_cb : allowed_types is invalid for SSHKey creds";
+                p->err = ErrorCodeCB::UrlTypeDoNotMatchCreds;
+                return (int) GIT_EUSER;
+            }
+            return git_cred_ssh_key_new(out, username_from_url, x.pub_key.toLocal8Bit().constData(),
+                                        x.priv_key.toLocal8Bit().constData(), x.passphrase.toLocal8Bit().constData());
+        }
+    };
+    auto ret = std::visit(v, p->creds);
+    return ret;
+}

plugins/Git/jobs/gitjob.h

@@ -0,0 +1,102 @@
+#ifndef GITJOB_H
+#define GITJOB_H
+
+#include <QDir>
+#include <QThread>
+extern "C" {
+#include <git2.h>
+}
+#include <variant>
+
+// Forward declarations for the different credential types.
+struct HTTP {};
+struct HTTPUserPass {
+    QString pass; ///< Password for HTTP user authentication.
+};
+struct SSHKey {
+    QString pub_key; ///< public key path.
+    QString priv_key; ///< private key path.
+    QString passphrase; ///< key passphrase.
+};
+
+
+
+/**
+ * @brief Variant type to represent various types of credentials.
+ *
+ * This type is used to store one of the following credential types:
+ * - HTTP
+ * - HTTPUserPass
+ * - SSHKey
+ */
+typedef std::variant<HTTP, HTTPUserPass, SSHKey> cred_type;
+
+enum class ErrorCodeCB {
+    None = 0,
+    NoUsername,
+    UrlTypeDoNotMatchCreds,
+    InvalidCreds,
+};
+
+
+struct PayloadCB {
+    bool called;
+    cred_type creds;
+    ErrorCodeCB err;
+    PayloadCB(bool ca, cred_type cr): called(ca), creds(cr), err(ErrorCodeCB::None) {}
+};
+
+/**
+ * @class GitJob
+ * @brief A class that manages Git-related tasks using libgit2.
+ *
+ * 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
+{
+    Q_OBJECT
+
+protected:
+    cred_type m_cred; ///< The credentials used for Git operations.
+
+    /**
+     * @brief Callback function for handling Git credentials during cloning.
+     *
+     * This function is called by libgit2 to handle credentials for cloning a repository.
+     * The callback is invoked when Git needs to authenticate with a remote repository.
+     *
+     * @param out Pointer to the credentials object that will be populated by the callback.
+     * @param url The URL of the repository being cloned.
+     * @param username_from_url The username extracted from the URL (if applicable).
+     * @param allowed_types A bitmask of the allowed types of credentials that can be used.
+     * @param payload User-defined data passed to the callback. This is typically the instance
+     *        of the class providing the callback, or other user-defined data.
+     *
+     * @return A status code indicating success (0) or failure (non-zero).
+     * @see git_cred
+     * @see git_cred_type
+     */
+    static int credentialsCB(git_cred **out, const char *url, const char *username_from_url,
+                             unsigned int allowed_types, void *payload);
+
+public:
+    /**
+     * @brief Constructor for the GitJob class.
+     *
+     * Initializes the GitJob instance with the given credentials.
+     *
+     * @param cred The credentials to be used for the Git operation. This can be one of
+     *        the following types: HTTP, HTTPUserPass, SSHPass, or SSHKey.
+     */
+    GitJob(cred_type cred);
+
+    /**
+     * @brief Destructor for the GitJob class.
+     *
+     * Cleans up any resources used by the GitJob.
+     */
+    ~GitJob();
+};
+
+#endif // GITJOB_H

plugins/Git/plugin.cpp

@@ -0,0 +1,12 @@
+#include <QtQml>
+#include <cstring>
+
+#include "plugin.h"
+#include "git.h"
+
+
+void GitPlugin::registerTypes(const char *uri)
+{
+    //@uri Git
+    qmlRegisterSingletonType<Git>(uri, 1, 0, "Git", [](QQmlEngine *, QJSEngine *) -> QObject * { return new Git; });
+}

plugins/Git/plugin.h

@@ -0,0 +1,16 @@
+#ifndef GITPLUGIN_H
+#define GITPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class GitPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID
+                      "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif

plugins/Git/qmldir

@@ -0,0 +1,2 @@
+module Git
+plugin Git

plugins/Git/utils.h

@@ -0,0 +1,21 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#define UNUSED(x) (void)(x) // Stub used to hide some warnings
+
+/**
+ * @brief A utility structure for enabling function overloading with template-based classes.
+ * see : https://stackoverflow.com/a/64018031
+ */
+template<class... Ts>
+struct overload : Ts... {
+    using Ts::operator()...;
+};
+/**
+ * @brief Deduction guide for the `overload` template.
+ * see : https://stackoverflow.com/a/64018031
+*/
+template<class... Ts>
+overload(Ts...) -> overload<Ts...>;
+
+#endif // UTILS_H

plugins/Pass/CMakeLists.txt

@@ -1,14 +1,19 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(PLUGIN "Pass")
 
 set(
         SRC
         plugin.cpp
-        git.cpp
         pass.cpp
-        gpg.cpp
-        passkeymodel.h
+        passkeyringmodel.h
         passphraseprovider.h
+        error.h
+        jobs/decryptjob.cpp
+        jobs/deletekeyjob.cpp
+        jobs/getkeysjob.cpp
+        jobs/importkeyjob.cpp
+        jobs/rmjob.cpp
+        jobs/rnpjob.cpp
 )
 
 set(CMAKE_AUTOMOC ON)
@@ -28,27 +33,23 @@ set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
 qt5_use_modules(${PLUGIN} Qml Quick DBus)
 
 
-add_library(gpgerror SHARED IMPORTED)
-set_property(TARGET gpgerror PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgpg-error.so.0.28.0")
+set(RNP_INSTALL_DIR "${CMAKE_SOURCE_DIR}/build/${ARCH_TRIPLET}/rnp/install")
+set(BOTAN_INSTALL_DIR "${CMAKE_SOURCE_DIR}/build/${ARCH_TRIPLET}/botan/install")
 
-add_library(libassuan SHARED IMPORTED)
-set_property(TARGET libassuan PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libassuan.so")
+find_package(JSON-C 0.11)
 
-add_library(libgpgme SHARED IMPORTED)
-set_property(TARGET libgpgme PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgpgme.so")
+INCLUDE_DIRECTORIES(${RNP_INSTALL_DIR}/include)
 
-add_library(libgpgmepp SHARED IMPORTED)
-set_property(TARGET libgpgmepp PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgpgmepp.so")
+add_library(rnp STATIC IMPORTED)
+set_property(TARGET rnp PROPERTY IMPORTED_LOCATION "${RNP_INSTALL_DIR}/lib/librnp.a")
 
-add_library(libqgpgme SHARED IMPORTED)
-set_property(TARGET libqgpgme PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libqgpgme.so.7")
+add_library(sexpp STATIC IMPORTED)
+set_property(TARGET sexpp PROPERTY IMPORTED_LOCATION "${RNP_INSTALL_DIR}/lib/libsexpp.a")
 
+add_library(botan STATIC IMPORTED)
+set_property(TARGET botan PROPERTY IMPORTED_LOCATION "${BOTAN_INSTALL_DIR}/lib/libbotan-2.a")
 
-add_library(libgit2 SHARED IMPORTED)
-set_property(TARGET libgit2 PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libgit2.so")
-
-target_link_libraries(${PLUGIN} gpgerror libassuan libgpgme libgpgmepp libgit2)
-
+target_link_libraries(${PLUGIN} rnp sexpp botan JSON-C::JSON-C)
 
 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
 install(TARGETS ${PLUGIN} DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN}/)

plugins/Pass/error.h

@@ -0,0 +1,63 @@
+// error.h
+#ifndef ERROR_H
+#define ERROR_H
+
+extern "C" {
+#include "rnp/rnp_err.h"
+}
+
+// Enum for general error codes
+enum class ErrorCode {
+    Error = 1,  ///< Generic error code
+};
+
+// Enum for errors related to showing errors (e.g., password issues, key issues)
+enum class ErrorCodeShow {
+    UnexpectedError = 1,  ///< Unknown or unexpected error
+    BadPassphrase,        ///< Invalid passphrase error
+    NoKeyFound,           ///< Key not found error
+    DecryptFailed         ///< Decryption failure error
+};
+
+/**
+* Convert an RNP error code to a corresponding ErrorCodeShow
+* @param rnpErrorCode The RNP error code
+* @return Corresponding ErrorCodeShow integer value
+*/
+inline ErrorCodeShow rnpErrorToErrorCodeShow(int rnpErrorCode)
+{
+    switch (rnpErrorCode) {
+    case RNP_ERROR_BAD_PASSWORD:
+        return ErrorCodeShow::BadPassphrase;   ///< Bad passphrase error
+    case RNP_ERROR_KEY_NOT_FOUND:
+    case RNP_ERROR_NO_SUITABLE_KEY:
+        return ErrorCodeShow::NoKeyFound;      ///< No key found error
+    case RNP_ERROR_DECRYPT_FAILED:
+        return ErrorCodeShow::DecryptFailed;    ///< Decryption failure error
+    default:
+        return ErrorCodeShow::UnexpectedError; ///< Default to unexpected error
+    }
+}
+
+// Enum for errors related to importing key files
+enum class ErrorCodeImportKeyFile {
+    UnexpectedError = 1,  ///< Unknown or unexpected error
+    BadFormat,            ///< Bad format error when importing the key file
+};
+
+/**
+* Convert an RNP error code to a corresponding ErrorCodeImportKeyFile
+* @param rnpErrorCode The RNP error code
+* @return Corresponding ErrorCodeImportKeyFile integer value
+*/
+inline ErrorCodeImportKeyFile rnpErrorToErrorCodeImportKeyFile(int rnpErrorCode)
+{
+    switch (rnpErrorCode) {
+    case RNP_ERROR_BAD_FORMAT:
+        return ErrorCodeImportKeyFile::BadFormat; ///< Bad format error
+    default:
+        return ErrorCodeImportKeyFile::UnexpectedError; ///< Default to unexpected error
+    }
+}
+
+#endif // ERROR_H

plugins/Pass/git.cpp

@@ -1,26 +0,0 @@
-
-
-
-#include <QDebug>
-#include <QUrl>
-extern "C" {
-#include <git2.h>
-}
-
-#include "git.h"
-
-
-
-Git::Git()
-{
-    git_libgit2_init();
-}
-
-Git::~Git() {
-    git_libgit2_shutdown();
-}
-
-bool Git::clone(QString url)
-{
-    return false;
-}

plugins/Pass/git.h

@@ -1,27 +0,0 @@
-#ifndef GIT_H
-#define GIT_H
-
-#include <QObject>
-#include <QUrl>
-#include <memory>
-
-class Git
-{
-private:
-    Git();
-public:
-
-    ~Git();
-
-    static std::shared_ptr<Git> instance()
-    {
-        static std::shared_ptr<Git> s{new Git};
-        return s;
-    }
-    Git(Git const &) = delete;
-    void operator=(Git const &) = delete;
-
-    bool clone(QString url);
-};
-
-#endif

plugins/Pass/gpg.cpp

@@ -1,294 +0,0 @@
-#include <memory>
-#include <QDebug>
-#include <QFile>
-#include <QDir>
-#include <QtCore/QStandardPaths>
-
-#include <gpgme.h>
-#include <gpgme++/data.h>
-#include <gpgme++/global.h>
-#include <gpgme++/context.h>
-#include <gpgme++/engineinfo.h>
-#include <gpgme++/keylistresult.h>
-#include <gpgme++/importresult.h>
-#include <gpgme++/encryptionresult.h>
-#include <gpgme++/decryptionresult.h>
-
-#include <qgpgme/importjob.h>
-#include <qgpgme/deletejob.h>
-#include <qgpgme/decryptjob.h>
-#include <qgpgme/encryptjob.h>
-#include <qgpgme/protocol.h>
-#include <qgpgme/keylistjob.h>
-#include <qgpgme/changeownertrustjob.h>
-
-#include "gpg.h"
-#include "passphraseprovider.h"
-#include "qprocess.h"
-
-
-
-
-using namespace GpgME;
-using namespace QGpgME;
-
-Gpg::Gpg()
-{
-    m_window = nullptr;
-
-    Gpg::initGpgConfig();
-
-    auto error = checkEngine(OpenPGP);
-    if (error) {
-        qDebug() << "Code Error : " << error.code();
-        qDebug() << "Error str : " << error.asString();
-        qFatal("GNUPG Engine check Fail");
-    }
-
-    qDebug() << "GNUPG Engine Version is :" << engineInfo(OpenPGP).version();
-    qDebug() << "GNUPG Executable is :" << engineInfo(OpenPGP).fileName();
-    qDebug() << "GNUPG Home is :" << engineInfo(OpenPGP).homeDirectory();
-}
-
-
-QString Gpg::initGpgHome()
-{
-    QString path = QStandardPaths::writableLocation(
-                       QStandardPaths::AppDataLocation).append("/.gpghome");
-    QDir dir(path);
-    if (!dir.exists()) {
-        dir.mkpath(".");
-    }
-    return path;
-}
-
-
-QString Gpg::findCommandPath(const QString &command) {
-    // Retrieve the PATH environment variable
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    QString pathEnv = env.value("PATH");
-
-    // Split the PATH by colon
-    QStringList pathDirs = pathEnv.split(":", QString::SkipEmptyParts);
-
-    // Check each directory in the PATH
-    foreach (const QString &dir, pathDirs) {
-        QFileInfo fileInfo(QDir(dir).filePath(command));
-
-        // If the file exists and is executable, return the path
-        if (fileInfo.exists() && fileInfo.isExecutable()) {
-            return fileInfo.absoluteFilePath();
-        }
-    }
-
-    return QString::null;
-}
-
-QString Gpg::initGpgExec()
-{
-    QString path = findCommandPath("gpg");
-    if (path.isNull()) {
-        qFatal("No valid gpg exec found !");
-    }
-    return path;
-}
-
-
-void Gpg::initGpgConfig()
-{
-    initializeLibrary();
-    gpgme_set_global_flag("disable-gpgconf", "1");
-
-    QString home = initGpgHome();
-    qDebug() << "Gpg home is " << home;
-    QString exec = initGpgExec();
-    qDebug() << "Gpg exec is " << exec;
-
-    QFile agentConf(home + QStringLiteral("/gpg-agent.conf"));
-    agentConf.remove();
-    agentConf.open(QIODevice::WriteOnly);
-    agentConf.write("allow-loopback-pinentry\n");
-    agentConf.close();
-
-    auto err = gpgme_set_engine_info (
-        GPGME_PROTOCOL_OpenPGP,
-        exec.toLocal8Bit().data(),
-        home.toLocal8Bit().data()
-    );
-    if (err != GPG_ERR_NO_ERROR) {
-        qDebug() << "Error code : " << err;
-        qDebug() << "Error str : " << gpg_strerror(err);
-        qFatal("GPGME set engine info failed !");
-    }
-}
-
-
-QPair<Error, QString> Gpg::decrypt(QByteArray cipherText)
-{
-    auto job = openpgp()->decryptJob();
-    auto ctx = DecryptJob::context(job);
-
-    auto provider = new UTPassphraseProvider;
-    ctx->setPassphraseProvider(provider);
-    ctx->setPinentryMode(Context::PinentryLoopback);
-
-    QByteArray plain_text;
-    auto decResult = job->exec(cipherText, plain_text);
-
-    delete job;
-
-    if (decResult.error()) {
-        qWarning() << "something gone wrong on decrypt";
-        qDebug() << "Code Error : " << decResult.error().code();
-        qDebug() << "Error str : " << decResult.error().asString();
-    }
-    return QPair<Error, QString>(decResult.error(), QString::fromUtf8(plain_text));
-}
-
-
-QPair<Error, QString> Gpg::decryptFromFile(QString path)
-{
-    qDebug() << "Decrypt from " << path;
-    QFile file(path);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qWarning() << "Can't open the File";
-        return QPair<Error, QString>(Error(), QString());;
-    }
-    QByteArray cipherText = file.readAll();
-    file.close();
-    return decrypt(cipherText);
-}
-
-
-QPair<Error, QByteArray> Gpg::encrypt(QString str, QString uid, bool ascii_armor, bool text_mode)
-{
-
-    qDebug() << "Encrypt to QByteArray";
-    auto keys = getKeys(uid);
-    if (keys.first) {
-        return QPair<Error, QByteArray>(keys.first, QByteArray());
-    }
-
-    auto job = std::unique_ptr<EncryptJob>(openpgp()->encryptJob(ascii_armor, text_mode));
-
-    QByteArray cipherText;
-    auto result = job->exec(keys.second, str.toUtf8(), Context::AlwaysTrust, cipherText);
-
-    qDebug() << "Encrypted to QByteArray";
-    return QPair<Error, QByteArray>(result.error(), cipherText);
-}
-
-
-Error Gpg::encryptToFile(QString str, QString path, QString uid, bool ascii_armor,
-                         bool text_mode)
-{
-    qDebug() << "Encrypting to file  " << path;
-    QFile file(path);
-    if (!file.open(QIODevice::WriteOnly)) {
-        qWarning() << "Can't open the file to write it" ;
-        return Error();
-    }
-    auto encrypt_ret = encrypt(str, uid, ascii_armor, text_mode);
-    if (encrypt_ret.first) {
-        file.write(encrypt_ret.second);
-    }
-    qDebug() << "Encrypting to file  " << path;
-    return encrypt_ret.first;
-}
-
-
-QPair<Error, std::vector< GpgME::Key >> Gpg::getAllKeys ( bool remote, const bool include_sigs,
-                                                          bool validate )
-{
-    return getKeys(QString(""), remote, include_sigs, validate);
-}
-
-QPair<Error, std::vector<Key>> Gpg::getKeys(QString pattern_uid, bool remote, bool include_sigs,
-                                            bool validate)
-{
-    qDebug() << "Getting the keys " << pattern_uid;
-    auto job = std::unique_ptr<KeyListJob>(openpgp()->keyListJob(remote, include_sigs, validate));
-
-    std::vector<Key> keys;
-    auto result = job->exec(QStringList() << pattern_uid, false, keys);
-
-    qDebug() << "Got the keys " << pattern_uid;
-    return QPair<Error, std::vector< Key >>(result.error(), keys);
-}
-
-
-QPair<Error, Key> Gpg::getKey(QString uid, bool remote, bool include_sigs, bool validate)
-{
-    qDebug() << "Getting the key " << uid;
-    auto keys = getKeys(uid, remote, include_sigs, validate);
-
-    if (keys.first or keys.second.size() != 1) {
-        qWarning() << "Bad id";
-        return QPair<Error, Key>(keys.first, Key::null);
-    }
-    qDebug() << "Got the key " << uid;
-    return QPair<Error, Key>(keys.first, keys.second.front());
-}
-
-
-Error Gpg::importKeysFromFile(QString path)
-{
-    qDebug() << "Importing the key file" << path;
-    qDebug() << "Decrypt from " << path;
-    QFile file(path);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qWarning() << "Can't open the File";
-        return Error();
-    }
-
-    auto job = openpgp()->importJob();
-    auto ctx = ImportJob::context(job);
-
-    auto provider = new UTPassphraseProvider;
-    ctx->setPassphraseProvider(provider);
-    ctx->setPinentryMode(Context::PinentryLoopback);
-    auto result = job->exec(file.readAll());
-
-    qDebug() << "numImported" << result.numImported();
-    qDebug() << "numSecretKeysImported" << result.numSecretKeysImported();
-    qDebug() << "numSecretKeysConsidered" << result.numSecretKeysConsidered();
-    qDebug() << "numSecretKeysUnchanged" << result.numSecretKeysUnchanged();
-    qDebug() << "numUnchanged" << result.numUnchanged();
-
-    file.close();
-    delete job;
-    delete provider;
-
-    if (result.error()) {
-        qWarning() << "Import go wrong";
-        qDebug() << "Code Error : " << result.error().code();
-        qDebug() << "Error str : " << result.error().asString();
-    }
-    qDebug() << "Imported the key file" << path;
-    return result.error();
-}
-
-Error Gpg::deleteKeyId(QString uid)
-{
-    qDebug() << "Deleting key id " << uid;
-    auto key = getKey(uid);
-
-    if (key.first) {
-        return key.first;
-    }
-
-    auto ctx = std::unique_ptr<Context>(Context::createForProtocol(OpenPGP));
-    auto err = ctx->deleteKey(key.second, true);
-
-    if (err) {
-        qWarning() << "Delete go wrong";
-        qDebug() << "Code Error : " << err.code();
-        qDebug() << "Error str : " << err.asString();
-        return err;
-    }
-
-    qDebug() << "Deleted key id" << uid;
-    return err;
-}
-
-

plugins/Pass/gpg.h

@@ -1,62 +0,0 @@
-#ifndef GPG_H
-#define GPG_H
-
-#include <memory>
-#include <QQuickWindow>
-#include <gpgme++/context.h>
-#include <qgpgme/changeownertrustjob.h>
-
-
-using namespace GpgME;
-
-class Gpg
-{
-private:
-    Gpg();
-    QObject *m_window;
-
-    QString findCommandPath(const QString &command);
-    QString initGpgHome();
-    QString initGpgExec();
-    void initGpgConfig();
-
-public:
-    ~Gpg();
-
-    static std::shared_ptr<Gpg> instance()
-    {
-        static std::shared_ptr<Gpg> s{new Gpg};
-        return s;
-    }
-    Gpg(Gpg const &) = delete;
-    void operator=(Gpg const &) = delete;
-
-    void setWindow(QObject *window)
-    {
-        m_window = window;
-    };
-
-    QObject *getWindow()
-    {
-        return m_window;
-    };
-
-
-    QPair< Error, std::vector< Key > > getAllKeys(bool remote = false, bool include_sigs = {}, bool
-                                                  validate = false);
-    QPair<Error, std::vector<Key>> getKeys( QString pattern_uid,  bool remote = false,
-                                            bool include_sigs = false,
-                                            bool validate = false);
-    QPair<Error, Key> getKey( QString uid,  bool remote = false,  bool include_sigs = false,
-                              bool validate = false);
-    QPair<Error, QString>  decrypt( QByteArray cipherText);
-    QPair<Error, QString> decryptFromFile( QString path);
-    QPair<Error, QByteArray> encrypt( QString str,  QString uid,  bool ascii_armor = true,
-                                      bool text_mode = true);
-    Error encryptToFile( QString str,  QString path,  QString uid,  bool ascii_armor = true,
-                         bool text_mode = true);
-    Error importKeysFromFile( QString path);
-    Error deleteKeyId( QString uid);
-};
-
-#endif

plugins/Pass/jobs/decryptjob.cpp

@@ -0,0 +1,47 @@
+#include "decryptjob.h"
+#include "qdebug.h"
+extern "C" {
+#include <rnp/rnp.h>
+#include <rnp/rnp_err.h>
+}
+
+DecryptJob::DecryptJob(QDir rnp_homedir, QString path):
+    RnpJob(rnp_homedir),
+    m_encrypted_file_path(path)
+{
+    this->setObjectName("DecryptJob");
+}
+
+
+void DecryptJob::run()
+{
+    qDebug() << "[DecryptJob] Starting";
+    this->loadFullKeyring(NULL);
+
+    rnp_input_t  input = NULL;
+    rnp_output_t output = NULL;
+    uint8_t     *buf = NULL;
+    size_t       buf_len = 0;
+    QString data = QString::Null();
+
+    auto ret = rnp_input_from_path(&input, this->m_encrypted_file_path.toLocal8Bit().data());
+    if (ret == RNP_SUCCESS) {
+        ret = rnp_output_to_memory(&output, 0);
+    }
+    if (ret == RNP_SUCCESS) {
+        ret = rnp_decrypt(this->m_ffi, input, output);
+    }
+    if (ret == RNP_SUCCESS) {
+        ret = rnp_output_memory_get_buf(output, &buf, &buf_len, false);
+    }
+    if (ret == RNP_SUCCESS) {
+        data = QString::fromUtf8((char*)buf, buf_len);
+    }
+
+    rnp_input_destroy(input);
+    rnp_output_destroy(output);
+
+    terminateOnError(ret);
+    emit resultSuccess(this->m_encrypted_file_path, data);
+    qDebug() << "[DecryptJob] Finished Successfully ";
+}

plugins/Pass/jobs/decryptjob.h

@@ -0,0 +1,54 @@
+#ifndef DECRYPTJOB_H
+#define DECRYPTJOB_H
+
+#include "rnpjob.h"
+#include <QThread>
+#include <QDir>
+
+/**
+ * @class DecryptJob
+ * @brief A job to handle the decryption of a file in a separate thread.
+ *
+ */
+class DecryptJob : public RnpJob
+{
+    Q_OBJECT
+
+    /**
+     * @brief Executes the decryption operation.
+     *
+     * This method performs the actual decryption of the encrypted file specified during
+     * object construction.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Emitted when the decryption operation is complete.
+     *
+     * This signal is emitted once the decryption operation finishes, providing the results.
+     * It indicates whether the decryption was successful and provides the clear-text output
+     * if the decryption was successful.
+     *
+     * @param encrypted_file_path The path to the encrypted file that was decrypted.
+     * @param clear_txt The decrypted content in clear-text. If an error occurs, this may be empty.
+     */
+    void resultSuccess(QString encrypted_file_path, QString clear_txt);
+
+private:
+    QString m_encrypted_file_path; /**< The path to the encrypted file that is to be decrypted. */
+
+public:
+    /**
+     * @brief Constructs a DecryptJob object with the specified encrypted file.
+     *
+     * This constructor initializes the DecryptJob with the encrypted file path. The decryption
+     * operation will be executed in a background thread when the job is started.
+     *
+     * @param rnp_homedir The directory containing the keyrings.
+     * @param path The path to the encrypted file that needs to be decrypted.
+     */
+    DecryptJob(QDir rnp_homedir, QString path);
+};
+
+#endif // DECRYPTJOB_H

plugins/Pass/jobs/deletekeyjob.cpp

@@ -0,0 +1,42 @@
+#include <QDebug>
+#include <QString>
+#include <QJsonDocument>
+#include "deletekeyjob.h"
+
+extern "C" {
+#include <rnp/rnp.h>
+#include <rnp/rnp_err.h>
+}
+
+DeleteKeyJob::DeleteKeyJob(QDir rnp_homedir, QString fingerprint):
+    RnpJob(rnp_homedir),
+    m_fingerprint(fingerprint)
+{
+    this->setObjectName("ImportKeyJob");
+}
+
+
+void DeleteKeyJob::run()
+{
+    qDebug() << "[DeleteKeyJob] Starting";
+
+    // Loading keyring
+    this->loadFullKeyring(NULL);
+
+    // Delete key
+    rnp_key_handle_t key = NULL;
+    auto ret = rnp_locate_key(this->m_ffi, "fingerprint", this->m_fingerprint.toLocal8Bit().data(), &key);
+
+    if (ret == RNP_SUCCESS) {
+        ret = rnp_key_remove(key, RNP_KEY_REMOVE_PUBLIC | RNP_KEY_REMOVE_SECRET | RNP_KEY_REMOVE_SUBKEYS);
+    };
+    rnp_key_handle_destroy(key);
+
+    // Save resulting keyring
+    this->saveFullKeyring();
+
+    // Emit result
+    terminateOnError(ret);
+    emit resultSuccess();
+    qDebug() << "[DeleteKeyJob] Finished Successfully ";
+}

plugins/Pass/jobs/deletekeyjob.h

@@ -0,0 +1,46 @@
+#ifndef DELETEKEYJOB_H
+#define DELETEKEYJOB_H
+
+#include "rnpjob.h"
+
+/**
+ * @class DeleteKeyJob
+ * @brief A job to handle the deletion of a key in a separate thread.
+ *
+ */
+class DeleteKeyJob : public RnpJob
+{
+    Q_OBJECT
+
+    /**
+     * @brief Executes the key deletion operation.
+     *
+     * This function performs the actual process of deleting the GPG key from the keyring.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Emitted when the key deletion operation is successful.
+     *
+     * This signal is emitted when the key is successfully deleted from the keyring..
+     */
+    void resultSuccess();
+
+private:
+    QString m_fingerprint; /**< The fingerprint of the key to delete. */
+
+public:
+    /**
+     * @brief Constructs a DeleteKeyJob object with the specified fingerprint and keyring directory.
+     *
+     * This constructor initializes the DeleteKeyJob instance with the directory containing
+     * the keyrings and the fingerprint of the GPG key to delete.
+     *
+     * @param rnp_homedir The directory containing the keyrings where the key will be deleted.
+     * @param fingerprint The fingerprint of the key to delete.
+     */
+    DeleteKeyJob(QDir rnp_homedir, QString fingerprint);
+};
+
+#endif // DELETEKEYJOB_H

plugins/Pass/jobs/getkeysjob.cpp

@@ -0,0 +1,45 @@
+#include <QDebug>
+#include "getkeysjob.h"
+#include <QJsonDocument>
+#include <QJsonObject>
+
+extern "C" {
+#include <rnp/rnp.h>
+#include <rnp/rnp_err.h>
+}
+
+GetKeysJob::GetKeysJob(QDir rnp_homedir):
+    RnpJob(rnp_homedir)
+{
+    this->setObjectName("GetKeysJob");
+}
+
+
+QJsonDocument GetKeysJob::fingerprint_map_key_info(const QString fingerprint)
+{
+    rnp_key_handle_t handle;
+    rnp_locate_key(this->m_ffi, "fingerprint", fingerprint.toLocal8Bit().data(), &handle);
+    char *result;
+    rnp_key_to_json( handle, 0, &result);
+    return QJsonDocument::fromJson(result);
+}
+
+void GetKeysJob::run()
+{
+    qDebug() << "[GetKeysJob] Starting";
+
+    // Loading keyring
+    QSet<QString> fingerprints = QSet<QString>();
+    this->loadFullKeyring(&fingerprints);
+
+    //Get infos keys
+    auto key_infos = QList<QJsonDocument>();
+    QList<QJsonDocument>::iterator i;
+    for (auto i = fingerprints.begin(), end = fingerprints.end(); i != end; ++i) {
+        key_infos.append(this->fingerprint_map_key_info(*i));
+    }
+
+    // Emit result
+    emit resultSuccess(key_infos);
+    qDebug() << "[GetKeysJob] Finished Successfully ";
+}

plugins/Pass/jobs/getkeysjob.h

@@ -0,0 +1,58 @@
+#ifndef GETKEYSJOB_H
+#define GETKEYSJOB_H
+
+#include <QJsonDocument>
+#include "rnpjob.h"
+
+/**
+ * @class GetKeysJob
+ * @brief A job to retrieve all GPG keys from keyrings in a separate thread.
+ *
+ */
+class GetKeysJob : public RnpJob
+{
+    Q_OBJECT
+
+    /**
+     * @brief Executes the process of fetching all GPG keys.
+     *
+     * This function performs the task of retrieving all keys from the keyrings.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Emitted when the key retrieval operation completes successfully.
+     *
+     * This signal is emitted when the keys are successfully fetched. It passes a list of
+     * JSON documents representing the retrieved keys.
+     *
+     * @param result A list of QJsonDocument objects containing the key information.
+     */
+    void resultSuccess(const QList<QJsonDocument> result);
+
+private:
+    /**
+     * @brief Retrieves key information for a specific key fingerprint.
+     *
+     * This helper function fetches the key data corresponding to the given fingerprint.
+     * The returned information is packaged in a JSON document.
+     *
+     * @param fingerprint The fingerprint of the key to fetch information for.
+     * @return A QJsonDocument containing the key's information.
+     */
+    QJsonDocument fingerprint_map_key_info(const QString fingerprint);
+
+public:
+    /**
+     * @brief Constructs a GetKeysJob object with the specified keyring directory.
+     *
+     * This constructor initializes the job with the directory containing the keyrings to
+     * search for GPG keys.
+     *
+     * @param rnp_homedir The directory that contains the keyrings.
+     */
+    GetKeysJob(QDir rnp_homedir);
+};
+
+#endif // GETKEYSJOB_H

plugins/Pass/jobs/importkeyjob.cpp

@@ -0,0 +1,49 @@
+#include <QDebug>
+#include <QString>
+#include <QJsonDocument>
+#include "importkeyjob.h"
+
+extern "C" {
+#include <rnp/rnp.h>
+#include <rnp/rnp_err.h>
+}
+
+ImportKeyJob::ImportKeyJob(QDir rnp_homedir, QString key_file_path):
+    RnpJob(rnp_homedir),
+    m_key_file_path(key_file_path)
+{
+    this->setObjectName("ImportKeyJob");
+}
+
+
+void ImportKeyJob::run()
+{
+    qDebug() << "[ImportKeyJob] Starting";
+
+    // Loading keyring
+    this->loadFullKeyring(NULL);
+
+    // Import new key
+    rnp_input_t input = NULL;
+    auto ret = rnp_input_from_path(&input, this->m_key_file_path.toLocal8Bit().constData());
+    if (ret == RNP_SUCCESS) {
+        char *r = NULL;
+        ret = rnp_import_keys(this->m_ffi,
+                              input,
+                              RNP_LOAD_SAVE_PUBLIC_KEYS | RNP_LOAD_SAVE_SECRET_KEYS,
+                              &r);
+
+        qDebug() << "[ImportKeyJob]" << QJsonDocument::fromJson(r);
+        rnp_buffer_destroy(r);
+    }
+
+    rnp_input_destroy(input);
+    terminateOnError(ret);
+
+    // Save resulting keyring
+    this->saveFullKeyring();
+
+    // Emit result
+    emit resultSuccess();
+    qDebug() << "[ImportKeyJob] Finished Successfully ";
+}

plugins/Pass/jobs/importkeyjob.h

@@ -0,0 +1,47 @@
+#ifndef IMPORTKEYJOB_H
+#define IMPORTKEYJOB_H
+
+#include "rnpjob.h"
+
+/**
+ * @class ImportKeyJob
+ * @brief A job to handle the import of a key file in a separate thread.
+ *
+ */
+class ImportKeyJob : public RnpJob
+{
+    Q_OBJECT
+
+    /**
+     * @brief Executes the key import operation.
+     *
+     * This function handles the actual process of importing the GPG key file into the
+     * keyring.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Emitted when the key import operation is successful.
+     *
+     * This signal is emitted when the key file is successfully imported into the keyring.
+     */
+    void resultSuccess();
+
+private:
+    QString m_key_file_path; /**< The path of the key file to import. */
+
+public:
+    /**
+     * @brief Constructs an ImportKeyJob object with the specified key file and keyring directory.
+     *
+     * This constructor initializes the ImportKeyJob instance with the directory containing
+     * the keyrings and the file path of the GPG key to import.
+     *
+     * @param rnp_homedir The directory containing the keyrings.
+     * @param path The path to the key file to import.
+     */
+    ImportKeyJob(QDir rnp_homedir, QString path);
+};
+
+#endif // IMPORTKEYJOB_H

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,50 @@
+#ifndef RMJOB_H
+#define RMJOB_H
+
+#include <QThread>
+#include <QDir>
+
+/**
+ * @class RmJob
+ * @brief A job to handle the recursive removal of a path in a separate thread.
+ *
+ */
+class RmJob : public QThread
+{
+    Q_OBJECT
+
+    /**
+     * @brief Executes the recursive remove operation.
+     *
+     * This method performs the recursive removal of the specified target path.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Emitted when the remove operation completes.
+     *
+     * This signal is emitted once the removal process is complete, indicating
+     * whether the operation succeeded or failed.
+     *
+     * @param err A boolean indicating whether an error occurred during the removal.
+     *        `true` if an error occurred, `false` if the operation was successful.
+     */
+    void resultReady(const bool err);
+
+private:
+    QString m_path; /**< The path to be removed. */
+
+public:
+    /**
+     * @brief Constructs an RmJob object with the specified path.
+     *
+     * This constructor initializes the job with the path of the directory or file to be
+     * removed. The job will be executed in a separate thread when started.
+     *
+     * @param path The path to the file or directory that should be removed.
+     */
+    RmJob(QString path);
+};
+
+#endif // RMJOB_H

plugins/Pass/jobs/rnpjob.cpp

@@ -0,0 +1,134 @@
+#include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QSet>
+#include "qjsonarray.h"
+#include "rnpjob.h"
+extern "C" {
+#include <rnp/rnp.h>
+#include <rnp/rnp_err.h>
+}
+
+RnpJob::RnpJob(QDir rnp_homedir):
+    m_rnp_homedir(rnp_homedir)
+{
+    qRegisterMetaType<rnp_result_t>("rnp_result_t");
+    qRegisterMetaType<QList<QJsonDocument >> ("QList<QJsonDocument>");
+    qRegisterMetaType<QString *>("QString*");
+
+    auto ret = rnp_ffi_create(&this->m_ffi,
+                              RNP_KEYSTORE_GPG,
+                              RNP_KEYSTORE_GPG);
+    if (ret != RNP_SUCCESS) {
+        qDebug() << "[RnpJob] Err : " << ret;
+        qFatal("Error on rnp ffi init!");
+    }
+}
+
+RnpJob::~RnpJob()
+{
+    auto ret = rnp_ffi_destroy(this->m_ffi);
+    if (ret != RNP_SUCCESS) {
+        qDebug() << "[RnpJob] Err : " << ret;
+        qFatal("Something go wrong on rnp ffi detroy");
+    }
+}
+
+bool RnpJob::passProvider(rnp_ffi_t        ffi,
+                          void            *app_ctx,
+                          rnp_key_handle_t key,
+                          const char      *pgp_context,
+                          char             buf[],
+                          size_t           buf_len)
+{
+    if (strcmp(pgp_context, "protect")) {
+        return false;
+    }
+
+    strncpy(buf, "password", buf_len);
+    return true;
+}
+
+
+void RnpJob::loadKeyFile(QSet<QString> *result_fingerprints, const QString path, const uint32_t flags)
+{
+    qDebug() << "[RnpJob] Load keyring at" << path;
+    rnp_input_t input = NULL;
+    if (QFileInfo::exists(this->pubringPath())) {
+        auto ret = rnp_input_from_path(&input, path.toLocal8Bit().constData());
+        char *json = NULL;
+        if (ret == RNP_SUCCESS) {
+            ret = rnp_import_keys(this->m_ffi,
+                                  input,
+                                  flags,
+                                  &json);
+        }
+        QJsonDocument json_document = QJsonDocument::fromJson(json);
+        qDebug() << "[RnpJob] json" << json_document;
+        if (result_fingerprints) {
+            foreach (const QJsonValue fingerprint,  json_document.object()["keys"].toArray()) {
+                qDebug() << "[RnpJob] Add fingerprint" << fingerprint["fingerprint"].toString();
+                result_fingerprints->insert(fingerprint["fingerprint"].toString());
+            }
+        }
+
+        rnp_input_destroy(input);
+        rnp_buffer_destroy(json);
+        terminateOnError(ret);
+        qDebug() << "[RnpJob] Keyring loaded successfully";
+    } else {
+        qDebug() << "[RnpJob] Keyring" << path << "not found";
+    }
+}
+
+
+void RnpJob::loadPubKeyring(QSet<QString> *result_fingerprints = NULL)
+{
+    this->loadKeyFile(result_fingerprints, this->pubringPath(), RNP_LOAD_SAVE_PUBLIC_KEYS);
+}
+
+void RnpJob::loadSecKeyring(QSet<QString> *result_fingerprints = NULL)
+{
+    this->loadKeyFile(result_fingerprints, this->secringPath(),  RNP_LOAD_SAVE_SECRET_KEYS);
+}
+
+void RnpJob::loadFullKeyring(QSet<QString> *result_fingerprints = NULL)
+{
+    this->loadPubKeyring(result_fingerprints);
+    this->loadSecKeyring(result_fingerprints);
+}
+
+
+void RnpJob::saveKeyFile(const QString path, const uint32_t flags)
+{
+    qDebug() << "[RnpJob] Saving keyring at" << path;
+    rnp_output_t output = NULL;
+    auto ret = rnp_output_to_file(&output, path.toLocal8Bit().data(), RNP_OUTPUT_FILE_OVERWRITE);
+    if (ret == RNP_SUCCESS) {
+        qDebug() << "[ImportKeyJob] Saving key pubring ";
+        ret = rnp_save_keys(this->m_ffi, RNP_KEYSTORE_GPG, output, flags);
+
+    }
+    if (ret == RNP_SUCCESS) {
+        ret = rnp_output_finish(output);
+    }
+    rnp_output_destroy(output);
+    terminateOnError(ret);
+}
+
+void RnpJob::savePubKeyring()
+{
+    this->saveKeyFile(this->pubringPath(), RNP_LOAD_SAVE_PUBLIC_KEYS);
+}
+
+void RnpJob::saveSecKeyring()
+{
+    this->saveKeyFile(this->secringPath(),  RNP_LOAD_SAVE_SECRET_KEYS);
+}
+
+void RnpJob::saveFullKeyring()
+{
+    this->savePubKeyring();
+    this->saveSecKeyring();
+}
+

plugins/Pass/jobs/rnpjob.h

@@ -0,0 +1,185 @@
+#ifndef RNPJOB_H
+#define RNPJOB_H
+
+#include <QThread>
+#include <QDir>
+extern "C" {
+#include <rnp/rnp.h>
+}
+#include <variant>
+
+#define terminateOnError(ret)                              \
+if(ret != RNP_SUCCESS) {                                    \
+        qDebug() << "[RnpJob] Err : " << ret;                   \
+        qDebug() << "[RnpJob] Err Msg : " << rnp_result_to_string(ret); \
+        emit resultError(ret);                                  \
+        return;                                                 \
+} \
+
+/**
+ * @class RnpJob
+ * @brief A base class that manages OpenPGP-related tasks using the librnp library.
+ *
+ * The RnpJob class serves as an abstraction for performing OpenPGP (RNP) operations, such as
+ * encryption, decryption, and key management, using the RNP library.
+ */
+class RnpJob : public QThread
+{
+    Q_OBJECT
+
+signals:
+    /**
+     * @brief Signal emitted when an error occurs in the RNP job.
+     *
+     * This signal is emitted when an error occurs during an RNP operation, such as key loading
+     * or encryption/decryption failure. The error code is passed to indicate the specific issue.
+     *
+     * @param err The error code returned by the RNP operation.
+     */
+    void resultError(const rnp_result_t err);
+
+private:
+    /**
+     * @brief A callback function for providing the passphrase to RNP.
+     *
+     * This static function is used as a callback to provide a passphrase to RNP when required
+     * during key operations such as decryption or signing. It allows the library to continue the
+     * operation with the necessary passphrase.
+     *
+     * @param ffi The RNP FFI handle.
+     * @param app_ctx The application context, used for accessing application-specific data.
+     * @param key The key for which the passphrase is required.
+     * @param pgp_context The context string (e.g., "decrypt").
+     * @param buf The buffer to fill with the passphrase.
+     * @param buf_len The length of the buffer.
+     *
+     * @return true if the passphrase was successfully provided, false otherwise.
+     */
+    static bool passProvider(rnp_ffi_t        ffi,
+                             void            *app_ctx,
+                             rnp_key_handle_t key,
+                             const char      *pgp_context,
+                             char             buf[],
+                             size_t           buf_len);
+
+    QDir m_rnp_homedir; /**< Directory that contains the keyrings and RNP configuration. */
+
+    /**
+     * @brief Loads a key file into the keyring.
+     *
+     * This method loads a key file into the keyring, adding keys specified by their fingerprints.
+     *
+     * @param result_fingerprints A set to hold the fingerprints of the keys loaded into the keyring.
+     * @param path The path to the key file.
+     * @param flags Flags specifying options for loading keys (e.g., overwrite, secret keys, etc.).
+     */
+    void loadKeyFile(QSet<QString> *result_fingerprints, const QString path, const uint32_t flags);
+
+    /**
+     * @brief Saves keys to the keyring file in the specified directory.
+     *
+     * This method saves a keyring to a file. It allows you to specify options such as overwriting
+     * existing files or including secret keys.
+     *
+     * @param path The path to the keyring file where the keys should be saved.
+     * @param flags Flags specifying options for saving the keys (e.g., overwrite, include secret keys, etc.).
+     */
+    void saveKeyFile(const QString path, const uint32_t flags);
+
+
+protected:
+    rnp_ffi_t m_ffi; /**< RNP FFI (Foreign Function Interface) handle, used for interacting with the RNP library. */
+
+    /**
+     * @brief Get the path to the public keyring.
+     *
+     * This method returns the file path to the public keyring (where public keys are stored).
+     * It combines the directory and file name to provide the full path.
+     *
+     * @return The path to the public keyring file.
+     */
+    QString pubringPath()
+    {
+        return this->m_rnp_homedir.filePath("pubring.pgp");
+    }
+
+    /**
+     * @brief Get the path to the secret keyring.
+     *
+     * This method returns the file path to the secret keyring (where private keys are stored).
+     * It combines the directory and file name to provide the full path.
+     *
+     * @return The path to the secret keyring file.
+     */
+    QString secringPath()
+    {
+        return this->m_rnp_homedir.filePath("secring.pgp");
+    }
+
+    /**
+     * @brief Loads the secret keyring into RNP.
+     *
+     * @param result_fingerprints A set that will hold the fingerprints of the loaded secret keys.
+     */
+    void loadSecKeyring(QSet<QString> *result_fingerprints);
+
+    /**
+     * @brief Loads the public keyring into RNP.
+     *
+     * @param result_fingerprints A set that will hold the fingerprints of the loaded public keys.
+     */
+    void loadPubKeyring(QSet<QString> *result_fingerprints);
+
+    /**
+     * @brief Loads both the public and secret keyrings into RNP.
+     *
+     * @param result_fingerprints A set that will hold the fingerprints of all loaded keys.
+     */
+    void loadFullKeyring(QSet<QString> *result_fingerprints);
+
+    /**
+     * @brief Saves the secret keyring to the RNP homedir.
+     *
+     */
+    void saveSecKeyring();
+
+    /**
+     * @brief Saves the public keyring to the RNP homedir.
+     *
+     */
+    void savePubKeyring();
+
+    /**
+     * @brief Saves both the public and secret keyrings to the RNP homedir.
+     *
+     */
+    void saveFullKeyring();
+
+public:
+    /**
+     * @brief Constructs an RnpJob object with the specified RNP home directory.
+     *
+     * This constructor initializes the RnpJob instance with the directory that contains the
+     * keyrings and RNP configuration. Keyring files (pubring.pgp and secring.pgp) will be found
+     * in this directory.
+     *
+     * @param rnp_homedir The directory containing the RNP keyrings and configuration files.
+     */
+    RnpJob(QDir rnp_homedir);
+
+    /**
+     * @brief Destructor for the RnpJob class.
+     *
+     * The destructor cleans up any resources used by the RnpJob instance, including releasing
+     * the RNP FFI handle.
+     */
+    ~RnpJob();
+
+
+    void setPassProvider(rnp_password_cb pass_provider_cb)
+    {
+        rnp_ffi_set_pass_provider(this->m_ffi, pass_provider_cb, NULL);
+    }
+};
+
+#endif // RNPJOB_H

plugins/Pass/pass.cpp

@@ -1,74 +1,248 @@
 #include <QUrl>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
-
+#include <QDirIterator>
+#include <QtConcurrent/QtConcurrent>
+#include "error.h"
+#include "jobs/decryptjob.h"
+#include "jobs/deletekeyjob.h"
+#include "jobs/getkeysjob.h"
+#include "jobs/importkeyjob.h"
+#include "jobs/rmjob.h"
 #include "pass.h"
-#include "git.h"
-#include "gpg.h"
-#include "passkeymodel.h"
+#include "passphraseprovider.h"
 
 
 
-Pass::Pass(): m_password_store (QStandardPaths::writableLocation(
-                                        QStandardPaths::AppDataLocation).append("/.password-store"))
-{}
+Pass::Pass():
+    m_password_store (QStandardPaths::writableLocation(
+                          QStandardPaths::AppDataLocation).append("/.password-store")),
+    m_gpg_home (QStandardPaths::writableLocation(
+                    QStandardPaths::AppDataLocation).append("/.rnp")),
+    m_passphrase_provider(&UTPassphraseProvider::get_pass_provider),
+    m_sem(std::unique_ptr<QSemaphore>(new QSemaphore(1)))
+{
+    this->initGpgHome();
+    this->initPasswordStore();
+    QObject::connect(this, &Pass::responsePassphraseDialogPropagate,
+                     &UTPassphraseProvider::instance(), &UTPassphraseProvider::handleResponse);
+}
 
-void Pass::init(QObject *window)
+void Pass::initialize(QObject *window)
 {
     if (!window) {
-        qFatal("window is invalid. Abording.");
-    }
-
-    Gpg::instance()->setWindow(window);
-
-    QDir dir(m_password_store);
-    if (!dir.exists())
-        dir.mkpath(".");
-    qInfo() << "Password Store is :" << m_password_store;
-}
-
-void Pass::decrypt(QUrl url)
-{
-    qInfo() << "Decrypting";
-    auto decrypt_ret = Gpg::instance()->decryptFromFile(url.toLocalFile());
-    if (decrypt_ret.first) {
-        qInfo() << "Decrypt Failed";
-        emit decryptFailed();
-    } else if (decrypt_ret.second.isNull()) {
-        qInfo() << "Decrypt Canceled";
-        emit decryptCanceled();
+        qWarning("[Pass] Window should be null only for testing");
     } else {
-        qInfo() << "Decrypt OK";
-        emit decrypted(decrypt_ret.second);
+        UTPassphraseProvider::instance().setWindow(window);
     }
 }
 
-bool Pass::gpgDeleteKeyId(QString id)
+
+void Pass::initGpgHome()
 {
-    qInfo() << "Deleting Key id " << id;
-    return !Gpg::instance()->deleteKeyId(id);
+    // delete gpghome from previous version using GPGME
+    QString path = QStandardPaths::writableLocation(
+                       QStandardPaths::AppDataLocation).append("/.gpghome");
+    QDir dir(path);
+    dir.removeRecursively();
+
+    // create gpghome for rnp
+    QDir dir_gpg_home(this->m_gpg_home);
+    if (!dir_gpg_home.exists()) {
+        dir_gpg_home.mkpath(".");
+    }
+    qInfo() << "[Pass] GPG Home is :" << m_gpg_home;
 }
 
-bool Pass::gpgImportKeyFromFile(QUrl url)
+void Pass::initPasswordStore()
 {
-    qInfo() << "Importing Key from " << url;
-    return !Gpg::instance()->importKeysFromFile(url.toLocalFile());
+    QDir dir_password_store(this->m_password_store);
+    if (!dir_password_store.exists()) {
+        dir_password_store.mkpath(".");
+    }
+    qInfo() << "[Pass] Password Store is :" << m_password_store;
 }
 
-QVariant Pass::gpgGetAllKeysModel()
+void Pass::lsJob()
 {
-    qInfo() << "Getting all key form gpg ";
-    return QVariant::fromValue(PassKeyModel::keysToPassKeyQObjectList(
-                                   Gpg::instance()->getAllKeys().second));
+    QDirIterator it(this->m_password_store, QStringList() << "*.gpg", QDir::Files, QDirIterator::Subdirectories);
+    QList<QString> ret;
+    while (it.hasNext()) {
+        QFile f(it.next());
+        QString fname = f.fileName();
+        fname.remove(0, this->m_password_store.length() + 1); // remove system path
+        ret.append(fname);
+    }
+    qInfo() << "[Pass] ls Succeed";
+    emit lsSucceed(ret);
+    this->m_sem->release(1);
 }
 
-QString Pass::getPasswordStore()
+bool Pass::ls()
 {
-    return m_password_store;
+    qInfo() << "[Pass] ls";
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    QtConcurrent::run(this, &Pass::lsJob );
+    return true;
 }
 
-bool Pass::gitClone(QString url)
+bool Pass::show(QUrl url)
 {
-    qInfo() << "Cloning . password_store from " << url;
-    return Git::instance()->clone(url);
+    qInfo() << "[Pass] Show";
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    auto job = new DecryptJob(this->m_gpg_home, url.toLocalFile());
+    job->setPassProvider(this->m_passphrase_provider);
+    QObject::connect(job, &DecryptJob::resultError, this, &Pass::slotShowError);
+    QObject::connect(job, &DecryptJob::resultSuccess, this, &Pass::slotShowSucceed);
+    connect(job, &DecryptJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+
+void Pass::slotShowError(rnp_result_t err)
+{
+    qInfo() << "[Pass] Show Failed";
+    emit showFailed((int) rnpErrorToErrorCodeShow(err), rnp_result_to_string(err));
+    this->m_sem->release(1);
+}
+
+
+void Pass::slotShowSucceed(QString encrypted_file_path, QString plain_text)
+{
+    qDebug() << "[Pass] Show Succeed";
+    QFileInfo file_info(encrypted_file_path);
+    emit showSucceed(file_info.completeBaseName(), plain_text);
+    this->m_sem->release(1);
+}
+
+bool Pass::deletePasswordStore()
+{
+    qInfo() << "[Pass] Delete Password Store at" << this->m_password_store;
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    auto job = new RmJob(this->m_password_store);
+    connect(job, &RmJob::resultReady, this, &Pass::slotDeletePasswordStoreResult);
+    connect(job, &RmJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+void Pass::slotDeletePasswordStoreResult(bool err)
+{
+    if (err) {
+        qInfo() << "[Pass] Delete Password Store Failed";
+        emit deletePasswordStoreFailed(static_cast<int>(ErrorCode::Error), "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);
+}
+
+
+bool Pass::deleteGPGKey(PassKeyModel* key)
+{
+    qInfo() << "[Pass] Delete GPG key fingerprint " << key->property("keyid").toString();
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    auto job = new DeleteKeyJob(this->m_gpg_home, key->property("fingerprint").toString());
+    QObject::connect(job, &DeleteKeyJob::resultError, this, &Pass::slotDeleteGPGKeyError);
+    QObject::connect(job, &DeleteKeyJob::resultSuccess, this, &Pass::slotDeleteGPGKeySucceed);
+    connect(job, &DeleteKeyJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+void Pass::slotDeleteGPGKeyError(rnp_result_t err)
+{
+    qInfo() << "[Pass] Delete GPG key Failed";
+    emit deleteGPGKeyFailed(static_cast<int>(ErrorCode::Error), rnp_result_to_string(err));
+    this->m_sem->release(1);
+}
+
+void Pass::slotDeleteGPGKeySucceed()
+{
+    qInfo() << "[Pass] Delete GPG key Succesfull";
+    emit deleteGPGKeySucceed();
+    this->m_sem->release(1);
+}
+
+
+bool Pass::importGPGKey(QUrl url)
+{
+    qInfo() << "[Pass] Import GPG Key from " << url;
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    auto job = new ImportKeyJob(this->m_gpg_home, url.toLocalFile());
+    QObject::connect(job, &ImportKeyJob::resultError, this, &Pass::slotImportGPGKeyError);
+    QObject::connect(job, &ImportKeyJob::resultSuccess, this, &Pass::slotImportGPGKeySucceed);
+    connect(job, &ImportKeyJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+void Pass::slotImportGPGKeyError(rnp_result_t err)
+{
+    qInfo() << "[Pass] Import GPG Key Failed";
+    emit importGPGKeyFailed((int) rnpErrorToErrorCodeImportKeyFile(err), rnp_result_to_string(err));
+    this->m_sem->release(1);
+}
+
+void Pass::slotImportGPGKeySucceed()
+{
+    qInfo() << "[Pass] Import GPG Key Succesfull";
+    emit importGPGKeySucceed();
+    this->m_sem->release(1);
+}
+
+bool Pass::getAllGPGKeys()
+{
+    qInfo() << "[Pass] Get all GPG Keys";
+    if (!this->m_sem->tryAcquire(1, 500)) {
+        qInfo() << "[Pass] A command is already running";
+        return false;
+    }
+    this->m_keyring_model = nullptr;
+    auto job = new GetKeysJob(this->m_gpg_home);
+    QObject::connect(job, &GetKeysJob::resultError, this, &Pass::slotGetAllGPGKeysError);
+    QObject::connect(job, &GetKeysJob::resultSuccess, this, &Pass::slotGetAllGPGKeysSucceed);
+    connect(job, &ImportKeyJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
+
+void Pass::slotGetAllGPGKeysError(rnp_result_t err)
+{
+    qInfo() << "[Pass] Get all GPG Keys Failed";
+    this->m_keyring_model = nullptr;
+    emit getAllGPGKeysFailed(static_cast<int>(ErrorCode::Error), rnp_result_to_string(err));
+    this->m_sem->release(1);
+}
+
+void Pass::slotGetAllGPGKeysSucceed(QList<QJsonDocument> result)
+{
+    qInfo() << "[Pass] Get all GPG Keys Succeed";
+    this->m_keyring_model = std::unique_ptr<PassKeyringModel>(new PassKeyringModel(result));
+    emit getAllGPGKeysSucceed(this->m_keyring_model.get());
+    this->m_sem->release(1);
+}
+
+void Pass::responsePassphraseDialog(bool cancel, QString passphrase)
+{
+    qDebug() << "[Pass] Propagate responsePassphraseDialog to UTPassphraseProvider";
+    emit responsePassphraseDialogPropagate(cancel, passphrase);
 }

plugins/Pass/pass.h

@@ -1,33 +1,257 @@
 #ifndef PASS_H
 #define PASS_H
 
+
+#include <QDebug>
 #include <QObject>
 #include <QUrl>
 #include <QVariant>
-
-
+#include <QSemaphore>
+#include <memory>
+extern "C" {
+#include <rnp/rnp.h>
+}
+#include "passkeyringmodel.h"
+/**
+ * @class Pass
+ * @brief A class for managing password storage using GPG encryption.
+ *
+ * This class provides functionalities for interacting with password storage, including
+ * storing, showing, importing, and deleting passwords securely using GPG encryption.
+ */
 class Pass : public QObject
 {
     Q_OBJECT
-    QString m_password_store;
+    Q_PROPERTY(QString password_store MEMBER m_password_store WRITE set_password_store )
+    Q_PROPERTY(QString gpg_home  MEMBER m_gpg_home WRITE set_gpg_home )
+
+private slots:
+    /**
+     * @brief Slot to handle the result of a GPG decryption operation (to show password).
+     * @param err The error that occurred during the operation.
+     * @param plain_text The decrypted plain text (password).
+     */
+    void slotShowError(rnp_result_t err);
+
+    void slotShowSucceed(QString encrypted_file_path, QString plain_text);
+
+    void slotDeleteGPGKeyError(rnp_result_t err);
+
+    void slotDeleteGPGKeySucceed();
+
+    /**
+     * @brief Slot to handle the error result of a GPG key import operation.
+     * @param err The error that occurred during the operation.
+     */
+    void slotImportGPGKeyError(rnp_result_t err);
+
+    /**
+     * @brief Slot to handle the succeed result of a GPG key import operation.
+     */
+    void slotImportGPGKeySucceed();
+
+    /**
+     * @brief Slot to handle the result of retrieving all GPG keys.
+     * @param err The error that occurred during the operation.
+     */
+    void slotGetAllGPGKeysError(rnp_result_t err);
+
+    /**
+     * @brief Slot to handle the succeed result of a GPG key get all keys operation.
+     */
+    void slotGetAllGPGKeysSucceed(QList<QJsonDocument> result);
+
+    /**
+     * @brief Slot to handle the result of a delete Password Store operation.
+     * @param err True if an error occurred during the operation.
+     */
+    void slotDeletePasswordStoreResult(bool err);
 
 signals:
-    void decrypted(QString text);
-    void decryptCanceled();
-    void decryptFailed();
+    // GPG-related signals
+    /**
+     * @brief Emitted when a GPG key is successfully deleted.
+     */
+    void deleteGPGKeySucceed();
 
+    /**
+     * @brief Emitted when a GPG key deletion fails.
+     * @param message The error message describing the failure.
+     */
+    void deleteGPGKeyFailed(int err, QString message);
+
+    /**
+     * @brief Emitted when a GPG key is successfully imported.
+     */
+    void importGPGKeySucceed();
+
+    /**
+     * @brief Emitted when a GPG key import fails.
+     * @param message The error message describing the failure.
+     */
+    void importGPGKeyFailed(int err, QString message);
+
+    /**
+     * @brief Emitted when all GPG keys are successfully retrieved.
+     * @param keys_info The list of retrieved keys.
+     */
+    void getAllGPGKeysSucceed(QObject* keys_info);
+
+    /**
+     * @brief Emitted when retrieving GPG keys fails.
+     * @param message The error message describing the failure.
+     */
+    void getAllGPGKeysFailed(int err, QString message);
+
+    // Pass-related signals
+    /**
+     * @brief Emitted to propagate passphrase dialog response.
+     * @param cancel Whether the dialog was cancelled.
+     * @param passphrase The passphrase entered, if not cancelled.
+     */
+    void responsePassphraseDialogPropagate(bool cancel, QString passphrase);
+
+    /**
+     * @brief Emitted when a password is successfully retrieved and shown.
+     * @param name The name of the password (e.g., service).
+     * @param text The password text.
+     */
+    void showSucceed(QString name, QString text);
+
+
+    void lsSucceed(QList<QString>);
+
+    /**
+     * @brief Emitted when showing a password fails.
+     * @param message The error message describing the failure.
+     */
+    void showFailed(int err, QString message);
+
+    /**
+     * @brief Emitted hen showing a password cancelled.
+     */
+    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(int err, QString message);
+
+private:
+    QString m_password_store; /**< The path to the password store. */
+    QString m_gpg_home; /**< The path to the gpg home. */
+    std::unique_ptr<PassKeyringModel>
+    m_keyring_model; /**< Meta data on the keyring uid, name, secrecy ... of the availble keys. */
+    rnp_password_cb m_passphrase_provider; /**< Pointer on passphrase povider for operations using secret keys. */
+    std::unique_ptr<QSemaphore> m_sem; /**< Semaphore for managing concurrent operations. */
+
+
+    /**
+     * @brief Initialize gpg home.
+     */
+    void initGpgHome();
+
+    /**
+     * @brief Initialize password store.
+     */
+    void initPasswordStore();
+
+    void lsJob();
 
 public:
+    /**
+     * @brief Constructs the Pass object.
+     */
     Pass();
-    ~Pass() override = default;
 
-    Q_INVOKABLE void init(QObject *window);
-    Q_INVOKABLE QString getPasswordStore();
-    Q_INVOKABLE void decrypt(QUrl url);
-    Q_INVOKABLE bool gpgDeleteKeyId(QString id);
-    Q_INVOKABLE bool gpgImportKeyFromFile(QUrl url);
-    Q_INVOKABLE QVariant gpgGetAllKeysModel();
-    Q_INVOKABLE bool gitClone(QString url);
+    /**
+     * @brief Set the path to the password store.
+     * @param The path to the password store.
+     */
+    void set_password_store(QString password_store)
+    {
+        qInfo() << "[Pass] Password Store changed to :" << password_store;
+        this->m_password_store = password_store;
+    };
+
+    /**
+     * @brief Set the path to the gpg hom.
+     * @param The path to the gpg hom
+     */
+    void set_gpg_home(QString gpg_home)
+    {
+        qInfo() << "[Pass] GPG Home changed to :" << gpg_home;
+        this->m_gpg_home = gpg_home;
+    };
+
+
+    void set_passphrase_provider(rnp_password_cb passphrase_provider)
+    {
+        this->m_passphrase_provider = passphrase_provider;
+    }
+
+    /**
+     * @brief Initializes the Pass object with the given window.
+     * @param window The QObject window to interact with.
+     */
+    Q_INVOKABLE void initialize(QObject *window);
+
+    // GPG-related methods
+
+    /**
+     * @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(PassKeyModel* key);
+
+    /**
+     * @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 job was start was successfully, false otherwise.
+     */
+    Q_INVOKABLE bool importGPGKey(QUrl url);
+
+    /**
+     * @brief  Launch the to retrieve all GPG keys.
+     * @return True if the job was start was successfully, false otherwise.
+     */
+    Q_INVOKABLE bool getAllGPGKeys();
+
+    /**
+     * @brief Return the response from the passphrase dialog.
+     * @param cancel Whether the dialog was cancelled.
+     * @param passphrase The passphrase entered, if not cancelled.
+     */
+    Q_INVOKABLE void responsePassphraseDialog(bool cancel, QString passphrase);
+
+    // Password store-related methods
+
+    /**
+     * @brief Get the list of password.
+     * @return The list of password in the password store.
+     */
+    Q_INVOKABLE bool ls();
+
+    /**
+     * @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 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/Pass/passkeymodel.h

@@ -1,74 +0,0 @@
-#ifndef PASSKEYMODEL_H
-#define PASSKEYMODEL_H
-
-#include <QObject>
-#include <gpgme++/key.h>
-
-using namespace GpgME;
-
-class PassKeyModel : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString uid READ uid WRITE setUid NOTIFY uidChanged MEMBER m_uid)
-    Q_PROPERTY(bool secret READ secret WRITE setSecret NOTIFY secretChanged MEMBER m_secret)
-    Q_PROPERTY(bool expired READ expired WRITE setExpired NOTIFY expiredChanged MEMBER m_expired)
-
-    QString m_uid;
-    bool m_secret;
-    bool m_expired;
-
-public:
-    PassKeyModel(QString uid, bool secret, bool expired):
-        m_uid(uid),
-        m_secret(secret),
-        m_expired(expired)
-    {};
-
-    PassKeyModel(Key key):
-        PassKeyModel(QString::fromUtf8(key.keyID()), key.hasSecret(), key.isExpired())
-    {};
-
-    static QList<QObject *> keysToPassKeyQObjectList(std::vector<Key> keys)
-    {
-        QList<QObject *> r;
-        std::for_each(keys.begin(), keys.end(), [&r](Key k) {
-            r.append(new PassKeyModel(k));
-        });
-        return r;
-    };
-
-    QString uid() const
-    {
-        return m_uid;
-    };
-    bool secret() const
-    {
-        return m_secret;
-    };
-    bool expired() const
-    {
-        return m_expired;
-    };
-
-    void setUid(QString uid)
-    {
-        m_uid = uid;
-        emit uidChanged(uid);
-    }
-    void setSecret(bool secret)
-    {
-        m_secret = secret;
-        emit secretChanged(secret);
-    }
-    void setExpired(bool expired)
-    {
-        m_expired = expired;
-        emit expiredChanged(expired);
-    }
-
-signals:
-    void uidChanged(QString);
-    void secretChanged(bool);
-    void expiredChanged(bool);
-};
-#endif

plugins/Pass/passkeyringmodel.h

@@ -0,0 +1,129 @@
+#ifndef PASSKEYRINGMODEL_H
+#define PASSKEYRINGMODEL_H
+
+#include <QDebug>
+#include <QObject>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QSet>
+
+/**
+ * @class PassKeyModel
+ * @brief A model representing a GPG (GNU Privacy Guard) key.
+ *
+ */
+class PassKeyModel : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString fingerprint MEMBER m_fingerprint CONSTANT)
+    Q_PROPERTY(QString keyid MEMBER m_keyid CONSTANT)
+    Q_PROPERTY(QVariant userids MEMBER m_userids CONSTANT)
+    Q_PROPERTY(bool hasSecret MEMBER m_hasSecret CONSTANT)
+
+private:
+    QString m_fingerprint; /**< The fingerprint of the GPG key, used to uniquely identify the key. */
+    QString m_keyid; /**< The unique ID associated with the GPG key. */
+    QVariant m_userids; /**< A list of user IDs associated with the GPG key. */
+    bool m_hasSecret; /**< Indicates whether the GPG key has an associated secret key. */
+
+public:
+    /**
+     * @brief Constructs a PassKeyModel object using the provided GPG key information.
+     *
+     * This constructor initializes the PassKeyModel based on a JSON document containing GPG key data.
+     * The key data typically includes the key's fingerprint, key ID, associated user IDs, and secret key status.
+     *
+     * @param key_info A JSON document containing the GPG key data.
+     */
+    PassKeyModel(QJsonDocument key_info)
+    {
+        this->m_fingerprint = key_info["fingerprint"].toString();
+        qDebug() << "[PassKeyModel] fingerprint : " << this->m_fingerprint;
+
+        this->m_keyid = key_info["keyid"].toString();
+        qDebug() << "[PassKeyModel] keyid : " << this->m_keyid;
+
+        auto user_ids_json_array = key_info["userids"].toArray();
+        auto userids = QList<QString>();
+        for (auto i = user_ids_json_array.begin(), end = user_ids_json_array.end(); i != end; ++i) {
+            userids.append((*i).toString());
+        }
+        this->m_userids = QVariant(userids);
+        qDebug() << "[PassKeyModel] userids : " << this->m_userids;
+
+        this->m_hasSecret = key_info["secret key"]["present"].toBool();
+        qDebug() << "[PassKeyModel] hasSecret : " << this->m_hasSecret;
+    }
+};
+
+
+/**
+ * @class PassKeyringModel
+ * @brief A model representing a collection of GPG keys.
+ *
+ * This class serves as a container for multiple GPG keys, typically representing an entire
+ * keyring. It provides functionality to manage and retrieve keys, such as fetching all keys
+ * in the keyring and determining the length of the keyring.
+ *
+ * The class also includes logic to distinguish between primary and sub keys, with an option
+ * to ignore subkeys if desired.
+ */
+class PassKeyringModel : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QList<QObject *> keys MEMBER m_keys CONSTANT)
+    Q_PROPERTY(int length READ length CONSTANT)
+
+private:
+    QList<QObject *> m_keys; /**< A list of PassKeyModel objects representing the keys in the keyring. */
+
+public:
+    /**
+     * @brief Constructs a PassKeyringModel from a list of GPG key JSON documents.
+     *
+     * This constructor initializes the PassKeyringModel by parsing a list of JSON documents
+     * that represent multiple GPG keys. It filters out subkeys and only retains primary keys
+     * for inclusion in the keyring.
+     *
+     * @param key_infos A list of JSON documents representing GPG keys.
+     */
+    PassKeyringModel(QList<QJsonDocument> key_infos)
+    {
+        for (auto i = key_infos.begin(), end = key_infos.end(); i != end; ++i) {
+            qDebug() << "[PassKeyringModel]" << *i;
+
+            // Ignore subkeys and only add primary keys to the model.
+            if ((*i)["primary key grip"].isUndefined()) {
+                this->m_keys.append(new PassKeyModel(*i));
+            } else {
+                qDebug() << "[PassKeyringModel] Subkey info " << (*i)["keyid"].toString() << "ignored";
+            }
+        }
+    }
+
+    /**
+     * @brief Destructor for PassKeyringModel.
+     *
+     * Cleans up dynamically allocated PassKeyModel objects within the keyring.
+     */
+    ~PassKeyringModel()
+    {
+        qDeleteAll(this->m_keys);
+    }
+
+    /**
+     * @brief Retrieves the number of keys in the keyring.
+     *
+     * This function returns the number of primary keys present in the keyring.
+     *
+     * @return The number of keys in the keyring.
+     */
+    int length()
+    {
+        return this->m_keys.length();
+    }
+};
+
+#endif // PASSKEYRINGMODEL_H

plugins/Pass/passphraseprovider.h

@@ -1,88 +1,190 @@
 #ifndef UTPASSPHRASEPROVIDER_H
 #define UTPASSPHRASEPROVIDER_H
 
+#include <QDebug>
+#include <memory>
 #include <stdio.h>
 #include <QObject>
 #include <QQmlProperty>
 #include <QEventLoop>
 #include <QSemaphore>
-#include <gpgme++/interfaces/passphraseprovider.h>
-#include "passphraseprovider.h"
-#include "gpg.h"
+extern "C" {
+#include <rnp/rnp.h>
+}
 
-
-
-class UTPassphraseProvider : public QObject, public PassphraseProvider
+/**
+ * @class UTPassphraseProvider
+ * @brief A passphrase provider for GPG operations that interacts with a QML dialog.
+ *
+ * This class is used to prompt the user for a passphrase through a QML-based dialog. It manages
+ * the passphrase entry process and signals whether the user has provided a passphrase or canceled
+ * the operation.
+ */
+class UTPassphraseProvider : public QObject
 {
     Q_OBJECT
-private:
-    std::unique_ptr<QEventLoop> m_loop;
-    std::unique_ptr<QSemaphore> m_sem;
-    char *m_passphrase;
-    bool m_canceled;
 
 public slots:
-    void handleResponse(bool canceled, QString p)
+    /**
+     * @brief Slot to handle the user's response from the passphrase dialog.
+     *
+     * This slot is called when the user provides a passphrase or cancels the passphrase entry.
+     * If the user provides a passphrase, it is stored; if the user cancels, a cancellation flag
+     * is set.
+     *
+     * @param canceled Indicates whether the user canceled the passphrase entry.
+     * @param passphrase The passphrase entered by the user (if not canceled).
+     */
+    void handleResponse(bool canceled, QString passphrase)
     {
-        if (!canceled)
-            gpgrt_asprintf(&m_passphrase, "%s", p.toUtf8().constData());
-        else
-            m_canceled = true;
-        m_loop->quit();
+        qDebug() << "[UTPassphraseProvider] Call handleResponse";
+        if (!canceled) {
+            this->m_canceled = false;
+            this->m_passphrase = passphrase;
+        }
+        unlockEventLoop();
     };
 
+signals:
+    /**
+     * @brief Signal to unlock the event loop.
+     *
+     * This signal is emitted when the passphrase has been entered or the operation has been canceled,
+     * causing the event loop waiting for the response to exit.
+     */
+    void unlockEventLoop();
 
-public:
-    UTPassphraseProvider():
-        m_loop(std::unique_ptr<QEventLoop>(new QEventLoop)),
-        m_sem(std::unique_ptr<QSemaphore>(new QSemaphore(1))),
-        m_passphrase(nullptr),
-        m_canceled(false)
+
+private:
+    /**
+     * @brief Private constructor for singleton pattern.
+     *
+     * Initializes the passphrase provider with a semaphore to manage access, and a flag to indicate
+     * whether the operation was canceled.
+     *
+     * @param parent Parent QObject (default is nullptr).
+     */
+    explicit UTPassphraseProvider(QObject * parent = nullptr)
+        : m_sem(std::make_unique<QSemaphore>(1)),
+          m_passphrase(QString::Null()),
+          m_canceled(true)
     {}
 
-    char *getPassphrase( const char *useridHint,
-                         const char *description,
-                         bool previousWasBad,
-                         bool &canceled ) Q_DECL_OVERRIDE {
-        if (!m_sem->tryAcquire(1, 3000))
-        {
-            qWarning() << "Cannot acquire UTPassphraseProvider semaphore.";
-            canceled = true;
-            return nullptr;
+    QObject *m_window; /**< The window object that triggers the QML dialog. */
+    std::unique_ptr<QSemaphore> m_sem; /**< Semaphore for managing access to the passphrase entry process. */
+    QString m_passphrase; /**< The passphrase provided by the user. */
+    bool m_canceled; /**< Flag indicating whether the passphrase operation was canceled. */
+
+public:
+    ~UTPassphraseProvider() = default;
+
+    /**
+     * @brief Gets the singleton instance of UTPassphraseProvider.
+     *
+     * This method ensures that only one instance of the passphrase provider exists throughout the application.
+     *
+     * @return The singleton instance of UTPassphraseProvider.
+     */
+    static UTPassphraseProvider &instance()
+    {
+        static UTPassphraseProvider instance;
+        return instance;
+    }
+
+    UTPassphraseProvider(UTPassphraseProvider const &) = delete; /**< Prevents copying of the instance. */
+    void operator=(UTPassphraseProvider const &) = delete; /**< Prevents assignment of the instance. */
+
+    /**
+     * @brief Callback function to retrieve the passphrase for GPG operations.
+     *
+     * This static method is called by the GPG library when it requires a passphrase for a specific key operation.
+     * It triggers a QML dialog to prompt the user for the passphrase and waits for a response.
+     *
+     * @param ffi The RNP FFI instance.
+     * @param app_ctx provided by application
+     * @param key the key, if any, for which the password is being requested.
+     *        Note: this key handle should not be held by the application,
+     *        it is destroyed after the callback. It should only be used to
+     *        retrieve information like the userids, grip, etc.
+     * @param pgp_context a descriptive string on why the password is being
+     *        requested, may have one of the following values:
+     *         - "add subkey": add subkey to the encrypted secret key
+     *         - "add userid": add userid to the encrypted secret key
+     *         - "sign": sign data
+     *         - "decrypt": decrypt data using the encrypted secret key
+     *         - "unlock": temporary unlock secret key (decrypting its fields), so it may be used
+     *           later without need to decrypt
+     *         - "protect": encrypt secret key fields
+     *         - "unprotect": decrypt secret key fields, leaving those in a raw format
+     *         - "decrypt (symmetric)": decrypt data, using the password
+     *         - "encrypt (symmetric)": encrypt data, using the password
+     * @param buf to which the callback should write the returned password, NULL terminated.
+     * @param buf_len the size of buf
+     *
+     * @return true if a password was provided, false otherwise
+     */
+    static bool
+    get_pass_provider(  rnp_ffi_t        ffi,
+                        void            *app_ctx,
+                        rnp_key_handle_t key,
+                        const char      *pgp_context,
+                        char             buf[],
+                        size_t           buf_len)
+    {
+        qDebug() << "[UTPassphraseProvider] Call the getPassphrase";
+
+        if (!UTPassphraseProvider::instance().m_window) {
+            qWarning() << "[UTPassphraseProvider] Aborting : window is not set";
+            return false;
         }
 
-        m_passphrase = nullptr;
-        m_canceled = false;
+        if (!UTPassphraseProvider::instance().m_sem->tryAcquire(1, 500)) {
+            qWarning() << "[UTPassphraseProvider] Aborting : Cannot acquire UTPassphraseProvider semaphore";
+            return false;
+        }
 
-        qDebug() << "Call the QML Dialog Passphrase Provider";
+        UTPassphraseProvider::instance().m_passphrase = QString::Null();
+        UTPassphraseProvider::instance().m_canceled = true;
+
+        qDebug() << "[UTPassphraseProvider] Call the QML Dialog Passphrase Provider";
         QMetaObject::invokeMethod(
-            Gpg::instance()->getWindow(), "callPassphraseDialog",
-            Q_ARG(QVariant, useridHint),
-            Q_ARG(QVariant, description),
-            Q_ARG(QVariant, previousWasBad)
+            UTPassphraseProvider::instance().m_window, "callPassphraseDialog",
+            Q_ARG(QVariant, "useridHint"),      // TODO
+            Q_ARG(QVariant, "description"),     // TODO
+            Q_ARG(QVariant, "previousWasBad")   // TODO
         );
 
-        qDebug() << "Waiting for response";
+        qDebug() << "[UTPassphraseProvider] Waiting for response";
 
-        QObject::connect(
-            Gpg::instance()->getWindow(), SIGNAL(responsePassphraseDialog(bool, QString)),
-            this, SLOT(handleResponse(bool, QString))
-        );
-        m_loop->exec();
+        QEventLoop loop;
+        QObject::connect(&UTPassphraseProvider::instance(), &UTPassphraseProvider::unlockEventLoop, &loop, &QEventLoop::quit);
+        loop.exec();
 
-        qDebug() << "Prepare Returns";
-        char *ret;
-        gpgrt_asprintf(&ret, "%s", m_passphrase);
-        canceled = m_canceled;
+        qDebug() << "[UTPassphraseProvider] Prepare Returns";
+        auto ret = false;
+        if (!UTPassphraseProvider::instance().m_canceled) {
+            strncpy(buf, UTPassphraseProvider::instance().m_passphrase.toLocal8Bit().data(), buf_len);
+            ret = true;
+        };
 
-        qDebug() << "Clean";
-        if (m_passphrase)
-        {
-            free(m_passphrase);
-        }
-        m_canceled = false;
-        m_sem->release(1);
+        qDebug() << "[UTPassphraseProvider] Clean Up";
+        UTPassphraseProvider::instance().m_passphrase = QString::Null();
+        UTPassphraseProvider::instance().m_canceled = true;
+        UTPassphraseProvider::instance().m_sem->release(1);
         return ret;
-    };
+    }
+
+    /**
+     * @brief Sets the window object that triggers the passphrase dialog.
+     *
+     * This method allows the passphrase provider to know which window should invoke the QML dialog.
+     *
+     * @param window The window object to set.
+     */
+    void setWindow(QObject* window)
+    {
+        this->m_window = window;
+    }
 };
-#endif
+
+#endif // UTPASSPHRASEPROVIDER_H

plugins/Utils/CMakeLists.txt

@@ -1,10 +1,11 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(PLUGIN "Utils")
 
 set(
         SRC
         plugin.cpp
         utils.cpp
+        jobs/unzipjob.cpp
 )
 
 set(CMAKE_AUTOMOC ON)
@@ -23,6 +24,10 @@ add_library(${PLUGIN} MODULE ${SRC})
 set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
 qt5_use_modules(${PLUGIN} Qml Quick DBus)
 
+add_library(libquazip5 SHARED IMPORTED)
+set_property(TARGET libquazip5 PROPERTY IMPORTED_LOCATION "/usr/lib/${ARCH_TRIPLET}/libquazip5.so")
+
+target_link_libraries(${PLUGIN} libquazip5)
 
 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
 

plugins/Utils/jobs/unzipjob.cpp

@@ -0,0 +1,56 @@
+#include <QFile>
+#include <QDir>
+#include <QUrl>
+#include <QtCore/QStandardPaths>
+#include <quazip5/JlCompress.h>
+
+#include "qdebug.h"
+#include "unzipjob.h"
+
+UnzipJob::UnzipJob(QUrl zip_url, QDir dir_out):
+    m_zip_url(zip_url),
+    m_dir_out(dir_out)
+{
+    this->setObjectName("UnzipJob");
+}
+
+void UnzipJob::run()
+{
+    auto tmp_dir_path =  QStandardPaths::writableLocation(
+                             QStandardPaths::CacheLocation).append("/unzip");
+
+    QDir tmp_dir(tmp_dir_path);
+    tmp_dir.removeRecursively();
+    tmp_dir.mkpath(".");
+
+    qDebug() << "Temp dir path is " << tmp_dir_path;
+    auto status =  !JlCompress::extractDir(
+                       this->m_zip_url.toLocalFile(),
+                       tmp_dir_path
+                   ).isEmpty();
+
+    if (!status) {
+        tmp_dir.removeRecursively();
+        emit resultReady(false);
+        return;
+    }
+
+    qDebug() << "Guessing if it should remove a single root folder";
+    QStringList files_in_tmp_dir = tmp_dir.entryList(QDir::AllEntries | QDir::Hidden |
+                                   QDir::NoDotAndDotDot);
+
+    auto dir_import_path =
+        files_in_tmp_dir.length() == 1 ?
+        tmp_dir_path.append("/" + files_in_tmp_dir.first()) : tmp_dir_path;
+    qDebug() << "Final imported tmp path dir is " << dir_import_path;
+
+    qDebug() << "Removing destination";
+    this->m_dir_out.removeRecursively();
+
+    qDebug() << "Moving zip content to destination";
+    QDir dir;
+    qDebug() <<  dir_import_path << " to " << this->m_dir_out;
+    auto ret = dir.rename(dir_import_path, this->m_dir_out.absolutePath());
+    tmp_dir.removeRecursively();;
+    emit resultReady(!ret);
+}

plugins/Utils/jobs/unzipjob.h

@@ -0,0 +1,49 @@
+#ifndef RMJOB_H
+#define RMJOB_H
+
+#include "qurl.h"
+#include <QThread>
+#include <QDir>
+
+/**
+ * @class RmJob
+ * @brief A class to handle removing recursively a path in a separate thread.
+ *
+ */
+class UnzipJob : public QThread
+{
+    Q_OBJECT
+
+    /**
+     * @brief The main function that performs the unzip operation.
+     *
+     * Handles the process of unziping a archive to a target directory.
+     */
+    void run() override;
+
+signals:
+    /**
+     * @brief Signal emitted when the unzip operation is complete.
+     *
+     * @param err A boolean indicating whether an error occurred during unzipping.
+     *        `true` if an error occurred, `false` if the clone was successful.
+     */
+    void resultReady(const bool err);
+
+private:
+    QUrl m_zip_url; ///< The url of the archive.
+    QDir m_dir_out; ///< The directory where the content of the archive will be unzip.
+
+public:
+    /**
+     * @brief Constructor for the UnzipJob class.
+     *
+     * Initializes the UnzipJob with the specified target path to be removed.
+     *
+     * @param zip_url Url of the archive to be unzip.
+     * @param dir_out Target directory where the content of the archive must be extracted.
+     */
+    UnzipJob(QUrl zip_url, QDir dir_out);
+};
+
+#endif // RMJOB_H

plugins/Utils/utils.cpp

@@ -1,53 +1,49 @@
-#include <QFile>
 #include <QDir>
-#include <QUrl>
-#include <QtCore/QStandardPaths>
-#include <quazip5/JlCompress.h>
+#include <QSemaphore>
 
+#include "jobs/unzipjob.h"
 #include "utils.h"
 
 
-Utils::Utils() {};
+
+Utils::Utils():
+    m_sem(std::unique_ptr<QSemaphore>(new QSemaphore(1)))
+{}
 
 bool Utils::unzip(QUrl zip_url, QString dir_out_path)
 {
-    auto tmp_dir_path =  QStandardPaths::writableLocation(
-                             QStandardPaths::CacheLocation).append("/unzip");
-
-    QDir tmp_dir(tmp_dir_path);
-    tmp_dir.removeRecursively();
-    tmp_dir.mkpath(".");
-
-    qDebug() << "Temp dir path is " << tmp_dir_path;
-    auto status =  !JlCompress::extractDir(
-                       zip_url.toLocalFile(),
-                       tmp_dir_path
-                   ).isEmpty();
-
-    if (!status) {
-        tmp_dir.removeRecursively();
+    if (!this->m_sem->tryAcquire(1, 500)) {
         return false;
     }
+    qInfo() << "[Utils] Unzip path " << zip_url << " to " << dir_out_path;
+    auto job = new UnzipJob(zip_url, QDir(dir_out_path));
+    connect(job, &UnzipJob::resultReady, this, &Utils::unzipResult);
+    connect(job, &UnzipJob::finished, job, &QObject::deleteLater);
+    job->start();
+    return true;
+}
 
-    qDebug() << "Guessing if it should remove a single root folder";
-    QStringList files_in_tmp_dir = tmp_dir.entryList(QDir::AllEntries | QDir::Hidden |
-                                                     QDir::NoDotAndDotDot);
+void Utils::unzipResult(bool err)
+{
 
-    auto dir_import_path =
-        files_in_tmp_dir.length() == 1 ?
-        tmp_dir_path.append("/" + files_in_tmp_dir.first()) : tmp_dir_path;
-    qDebug() << "Final imported tmp path dir is " << dir_import_path;
+    qDebug() << "[Utils] Unzip Result";
+    if (err) {
+        qInfo() << "[Utils] Unzip Failed";
+        emit unzipFailed();
 
-    qDebug() << "Removing destination";
-    QDir dir_out(dir_out_path);
-    dir_out.removeRecursively();
+    } else {
+        qInfo() << "[Utils] Unzip Succeed";
+        emit unzipSucceed();
+    }
+    this->m_sem->release(1);
+}
 
-    qDebug() << "Moving zip content to destination";
-    QDir dir;
-    qDebug() <<  dir_import_path << " to " << dir_out_path;
-    auto ret = dir.rename(dir_import_path, dir_out_path);
-    tmp_dir.removeRecursively();;
-    return ret;
+
+QString Utils::manifestPath()
+{
+    auto path = QDir(QDir::currentPath()).filePath("manifest_.json");
+    qInfo() << "[Utils] Manifest path : " << path;
+    return path;
 }
 
 bool Utils::rmFile(QUrl file_url)
@@ -60,3 +56,12 @@ bool Utils::rmDir(QUrl dir_url)
     QDir dir(dir_url.toLocalFile());
     return dir.removeRecursively();
 }
+
+bool Utils::fileExists(QUrl path)
+{
+    QString p = path.toString();
+    auto ret = QFileInfo::exists(p) && QFileInfo(p).isFile();
+    qDebug() << "[Utils]" << path << "existing file :" << ret;
+    return ret;
+}
+

plugins/Utils/utils.h

@@ -4,18 +4,90 @@
 #include <QObject>
 #include <QUrl>
 #include <QQuickWindow>
+#include <memory>
+#include <QSemaphore>
 
+/**
+ * @class Utils
+ * @brief A utility class that provides helper functions for file and directory operations.
+ *
+ * The `Utils` class contains various helper methods such as for managing files and directories, including unzipping files
+ * and removing files or directories.
+ */
 class Utils : public QObject
 {
     Q_OBJECT
 
-public:
-    Utils();
-    ~Utils() override = default;
 
+private slots:
+    /**
+     * @brief Slot to handle the result of a unzip operation.
+     * @param err True if an error occurred during the operation.
+     */
+    void unzipResult(bool err);
+
+signals:
+    /**
+     * @brief Emitted when the archive is successfully extracted.
+     */
+    void unzipSucceed();
+
+    /**
+     * @brief Emitted when the unzipping operation fails.
+     */
+    void unzipFailed();
+
+private:
+    std::unique_ptr<QSemaphore> m_sem; /**< Semaphore for managing concurrent operations. */
+
+public:
+    /**
+     * @brief Constructor for the Utils class.
+     */
+    Utils();
+
+    /**
+     * @brief Start a job to unzips a ZIP file to the specified output directory.
+     *
+     * @param zip_url The URL of the ZIP file to unzip.
+     * @param dir_out The output directory where the contents of the ZIP file should be extracted.
+     * @return `true` if the unzipping job is started successfullly, `false` otherwise.
+     */
     Q_INVOKABLE bool unzip(QUrl zip_url, QString dir_out);
+
+    /**
+     * @brief Retrieves the path to the manifest data.
+     *
+     * This function returns the full path to the manifest file used by the application.
+     *
+     * @return A QString containing the manifest file path.
+     */
+    Q_INVOKABLE QString manifestPath();
+
+    /**
+     * @brief Removes a file located at the specified URL.
+     *
+     * @param file_url The URL of the file to remove.
+     * @return `true` if the file was successfully removed; `false` otherwise.
+     */
     Q_INVOKABLE bool rmFile(QUrl file_url);
+
+    /**
+     * @brief Removes a directory located at the specified URL.
+     *
+     * @param dir_url The URL of the directory to remove.
+     * @return `true` if the directory was successfully removed; `false` otherwise.
+     */
     Q_INVOKABLE bool rmDir(QUrl dir_url);
+
+    /**
+     * @brief Verify that file exists at the specified URL.
+     *
+     * @param path The URL of the file to verfidy.
+     * @return `true` if the file exist; `false` otherwise.
+     */
+    Q_INVOKABLE bool fileExists(QUrl path);
+
 };
 
 #endif

po/nl.po

@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the utpass.qrouland package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: utpass.qrouland\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-02-04 17:49+0100\n"
+"PO-Revision-Date: 2025-02-12 22:20+0100\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: \n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.5\n"
+
+#: ../qml/dialogs/ErrorDialog.qml:12
+msgid "Error !"
+msgstr "Foutmelding!"
+
+#: ../qml/dialogs/ErrorDialog.qml:16
+msgid "Close"
+msgstr "Sluiten"
+
+#: ../qml/dialogs/PassphraseDialog.qml:15
+msgid "Authentication required"
+msgstr "Verificatie vereist"
+
+#: ../qml/dialogs/PassphraseDialog.qml:16
+msgid "Enter passphrase:"
+msgstr "Voer de toegangszin in:"
+
+#: ../qml/dialogs/PassphraseDialog.qml:21
+msgid "passphrase"
+msgstr "toegangszin"
+
+#: ../qml/dialogs/PassphraseDialog.qml:29
+#: ../qml/dialogs/SimpleValidationDialog.qml:8
+msgid "Ok"
+msgstr "Oké"
+
+#: ../qml/dialogs/PassphraseDialog.qml:41
+#: ../qml/dialogs/SimpleValidationDialog.qml:28
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../qml/dialogs/SuccessDialog.qml:12
+msgid "Success !"
+msgstr "Goedgekeurd!"
+
+#: ../qml/dialogs/SuccessDialog.qml:16
+msgid "OK"
+msgstr "Oké"
+
+#: ../qml/pages/Info.qml:62
+msgid "<b>Version</b>"
+msgstr "<b>Versie</b>"
+
+#: ../qml/pages/Info.qml:83
+msgid "<b>Maintainer</>"
+msgstr "<b>Onderhouder</b>"
+
+#: ../qml/pages/Info.qml:110
+msgid "Suggest improvement(s) or report a bug(s)"
+msgstr "Ideeën delen of bugs melden"
+
+#: ../qml/pages/Info.qml:115
+msgid "Access to the source code"
+msgstr "Broncode bekijken"
+
+#: ../qml/pages/Info.qml:123
+msgid "Released under the terms of the GNU GPL v3"
+msgstr "Uitgebracht onder de GNU GPLv3-licentie"
+
+#: ../qml/pages/Info.qml:132 ../qml/pages/headers/MainHeader.qml:33
+msgid "Info"
+msgstr "Informatie"
+
+#: ../qml/pages/PasswordList.qml:45
+msgid "No password found"
+msgstr "Er zijn geen wachtwoorden beschikbaar"
+
+#: ../qml/pages/PasswordList.qml:58
+msgid "You can import a password store by cloning or"
+msgstr "Importeer wachtwoorden door te klonen of een zipbestand"
+
+#: ../qml/pages/PasswordList.qml:65
+msgid "importing a password store zip in the settings"
+msgstr "te importeren vanuit de instellingen"
+
+#: ../qml/pages/PasswordList.qml:100
+msgid "Decryption failed !"
+msgstr "Het ongrendelen is mislukt!"
+
+#: ../qml/pages/PasswordList.qml:114
+msgid "Back"
+msgstr "Terug"
+
+#: ../qml/pages/PasswordList.qml:121 ../qml/pages/headers/MainHeader.qml:9
+#: ../qml/pages/headers/StackHeader.qml:9 UTPass.desktop.in.h:1
+msgid "UTPass"
+msgstr "UTPass"
+
+#: ../qml/pages/headers/MainHeader.qml:26 ../qml/pages/settings/Settings.qml:75
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ../qml/pages/headers/MainHeader.qml:57
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../qml/pages/settings/DeleteRepo.qml:42
+#: ../qml/pages/settings/Settings.qml:58
+msgid "Delete Password Store"
+msgstr "Wachtwoordopslag verwijderen"
+
+#: ../qml/pages/settings/DeleteRepo.qml:55
+msgid "You're are about to delete<br>the current Password Store.<br>Continue ?"
+msgstr ""
+"Je staat op het punt om de huidige<br>wachtwoordopslag te verwijderen."
+"<br>Weet je het zeker?"
+
+#: ../qml/pages/settings/DeleteRepo.qml:56
+#: ../qml/pages/settings/ImportZip.qml:66
+#: ../qml/pages/settings/InfoKeys.qml:174
+#: ../qml/pages/settings/git/ImportGitClone.qml:56
+msgid "Yes"
+msgstr "Ja"
+
+#: ../qml/pages/settings/DeleteRepo.qml:69
+msgid "Password Store removal failed !"
+msgstr "Het verwijderen is mislukt!"
+
+#: ../qml/pages/settings/DeleteRepo.qml:78
+msgid "Password Store deleted !"
+msgstr "De opslag is verwijderd!"
+
+#: ../qml/pages/settings/DeleteRepo.qml:90
+#: ../qml/pages/settings/InfoKeys.qml:216
+msgid "Info Keys"
+msgstr "Informatiesleutels"
+
+#: ../qml/pages/settings/ImportKeyFile.qml:61
+msgid "Key import failed !"
+msgstr "Het importeren is mislukt!"
+
+#: ../qml/pages/settings/ImportKeyFile.qml:70
+msgid "Key successfully imported !"
+msgstr "De sleutels zijn geïmporteerd!"
+
+#: ../qml/pages/settings/ImportKeyFile.qml:81
+msgid "GPG Key Import"
+msgstr "Gpg-sleutelimport"
+
+#: ../qml/pages/settings/ImportZip.qml:65
+msgid ""
+"Importing a new zip will delete<br>any existing password store!<br>Continue ?"
+msgstr ""
+"Door een zipbestand te importeren<br>wordt de huidige opslag gewist!<br>Weet "
+"je het zeker?"
+
+#: ../qml/pages/settings/ImportZip.qml:79
+msgid "Password store import failed !"
+msgstr "Het importeren is mislukt!"
+
+#: ../qml/pages/settings/ImportZip.qml:88
+#: ../qml/pages/settings/git/ImportGitClone.qml:78
+msgid "Password store sucessfully imported !"
+msgstr "De wachtwoorden zijn geïmporteerd!"
+
+#: ../qml/pages/settings/ImportZip.qml:100
+msgid "Zip Password Store Import"
+msgstr "Zipbestandsimport"
+
+#: ../qml/pages/settings/InfoKeys.qml:47
+msgid "No key found"
+msgstr "Er zijn geen sleutels aangetroffen"
+
+#: ../qml/pages/settings/InfoKeys.qml:83
+msgid "Key ID :"
+msgstr "Sleutel-id:"
+
+#: ../qml/pages/settings/InfoKeys.qml:124
+msgid "User IDs : "
+msgstr "Gebruikers-id's: "
+
+#: ../qml/pages/settings/InfoKeys.qml:151
+msgid "Delete this key"
+msgstr "Sleutel verwijderen"
+
+#: ../qml/pages/settings/InfoKeys.qml:173
+msgid "You're are about to delete<br>%1.<br>Continue ?"
+msgstr "Je staat op het punt om<br>%1 te verwijderen.<br>Weet je het zeker?"
+
+#: ../qml/pages/settings/InfoKeys.qml:187
+msgid "Key removal failed !"
+msgstr "Het verwijderen is mislukt!"
+
+#: ../qml/pages/settings/InfoKeys.qml:196
+msgid "Key successfully deleted !"
+msgstr "De sleutel is verwijderd!"
+
+#: ../qml/pages/settings/InfoKeys.qml:208
+msgid "An Error occured getting GPG keys !"
+msgstr "Er is een fout opgetreden tijdens het ophalen van de sleutels!"
+
+#: ../qml/pages/settings/Settings.qml:23
+msgid "GPG"
+msgstr "Gpg"
+
+#: ../qml/pages/settings/Settings.qml:29
+msgid "Import a GPG key file"
+msgstr "Gpg-sleutelbestand importeren"
+
+#: ../qml/pages/settings/Settings.qml:34
+msgid "Show GPG keys"
+msgstr "Gpg-sleutels bekijken"
+
+#: ../qml/pages/settings/Settings.qml:42
+msgid "Password Store"
+msgstr "Wachtwoordopslag"
+
+#: ../qml/pages/settings/Settings.qml:48
+msgid "Import a Password Store using Git"
+msgstr "Wachtwoordopslag importeren met Git"
+
+#: ../qml/pages/settings/Settings.qml:53
+msgid "Import a Password Store Zip"
+msgstr "Wachtwoordopslag importeren uit zipbestand"
+
+#: ../qml/pages/settings/Settings.qml:67
+msgid "Warning: importing delete any exiting Password Store"
+msgstr "Waarschuwing: de huidige opslag wordt hierdoor gewist"
+
+#: ../qml/pages/settings/git/GitCloneHttp.qml:16
+#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:16
+msgid "Repo Url"
+msgstr "Repo-url"
+
+#: ../qml/pages/settings/git/GitCloneHttp.qml:40
+#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:60
+msgid "Clone"
+msgstr "Klonen"
+
+#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:35
+#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:46
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../qml/pages/settings/git/ImportGitClone.qml:55
+msgid ""
+"Importing a git repo will delete<br>any existing password store!"
+"<br>Continue ?"
+msgstr ""
+"Door een git-repo te importeren<br>wordt de huidige opslag gewist!<br>Weet "
+"je het zeker?"
+
+#: ../qml/pages/settings/git/ImportGitClone.qml:69
+msgid "An error occured during git clone !"
+msgstr "Er is een fout opgetreden tijdens het klonen!"
+
+#: ../qml/pages/settings/git/ImportGitClone.qml:90
+msgid "Git Clone Import"
+msgstr "Git-kloonimport"

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-07 13:36+0000\n"
+"POT-Creation-Date: 2026-01-05 19:03+0000\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"
@@ -17,169 +17,338 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../qml/components/FileDir.qml:71
-msgid "Decryption failed !"
+#: ../qml/components/GitCloneHttp.qml:22
+#: ../qml/components/GitCloneHttpAuth.qml:22
+#: ../qml/components/GitCloneSshKey.qml:41
+msgid "Repo Url"
 msgstr ""
 
-#: ../qml/dialogs/DoubleValidationDialog.qml:28
-#: ../qml/dialogs/PassphraseDialog.qml:29
-#: ../qml/dialogs/SimpleValidationDialog.qml:19
-msgid "Ok"
+#: ../qml/components/GitCloneHttp.qml:47
+#: ../qml/components/GitCloneHttpAuth.qml:67
+#: ../qml/components/GitCloneSshKey.qml:143
+msgid "Clone"
 msgstr ""
 
-#: ../qml/dialogs/DoubleValidationDialog.qml:44
-#: ../qml/dialogs/PassphraseDialog.qml:41
-#: ../qml/dialogs/SimpleValidationDialog.qml:30
-msgid "Cancel"
+#: ../qml/components/GitCloneHttpAuth.qml:42
+#: ../qml/components/GitCloneHttpAuth.qml:53
+msgid "Password"
 msgstr ""
 
-#: ../qml/dialogs/ErrorDialog.qml:12
+#: ../qml/components/GitCloneSshKey.qml:61
+msgid "SSH private key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:70
+msgid "Import SSH private key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:79
+msgid "Delete SSH private key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:89
+msgid "SSH public key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:98
+msgid "Delete SSH public key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:107
+msgid "Import SSH public key"
+msgstr ""
+
+#: ../qml/components/GitCloneSshKey.qml:118
+#: ../qml/components/GitCloneSshKey.qml:129
+msgid "Passphrase"
+msgstr ""
+
+#: ../qml/components/ImportFile.qml:18
+msgid "Import succeeded !"
+msgstr ""
+
+#: ../qml/components/ImportFile.qml:19
+msgid "Import failed !"
+msgstr ""
+
+#: ../qml/components/ImportFile.qml:21
+msgid "File Imported"
+msgstr ""
+
+#: ../qml/dialogs/ErrorDialog.qml:13
 msgid "Error !"
 msgstr ""
 
-#: ../qml/dialogs/ErrorDialog.qml:15 ../qml/dialogs/SuccessDialog.qml:15
-msgid "OK"
+#: ../qml/dialogs/ErrorDialog.qml:17
+msgid "Close"
 msgstr ""
 
-#: ../qml/dialogs/PassphraseDialog.qml:7
+#: ../qml/dialogs/PassphraseDialog.qml:15
 msgid "Authentication required"
 msgstr ""
 
-#: ../qml/dialogs/PassphraseDialog.qml:8
+#: ../qml/dialogs/PassphraseDialog.qml:16
 msgid "Enter passphrase:"
 msgstr ""
 
-#: ../qml/dialogs/PassphraseDialog.qml:20
+#: ../qml/dialogs/PassphraseDialog.qml:21
 msgid "passphrase"
 msgstr ""
 
+#: ../qml/dialogs/PassphraseDialog.qml:29
+#: ../qml/dialogs/SimpleValidationDialog.qml:8
+msgid "Ok"
+msgstr ""
+
+#: ../qml/dialogs/PassphraseDialog.qml:41
+#: ../qml/dialogs/SimpleValidationDialog.qml:28
+msgid "Cancel"
+msgstr ""
+
 #: ../qml/dialogs/SuccessDialog.qml:12
 msgid "Success !"
 msgstr ""
 
-#: ../qml/pages/Info.qml:11 ../qml/pages/headers/MainHeader.qml:58
-msgid "Info"
+#: ../qml/dialogs/SuccessDialog.qml:16
+msgid "OK"
 msgstr ""
 
-#: ../qml/pages/Info.qml:50
+#: ../qml/pages/Info.qml:62
 msgid "<b>Version</b>"
 msgstr ""
 
-#: ../qml/pages/Info.qml:68
+#: ../qml/pages/Info.qml:83
 msgid "<b>Maintainer</>"
 msgstr ""
 
-#: ../qml/pages/Info.qml:90
+#: ../qml/pages/Info.qml:110
 msgid "Suggest improvement(s) or report a bug(s)"
 msgstr ""
 
-#: ../qml/pages/Info.qml:94
+#: ../qml/pages/Info.qml:115
 msgid "Access to the source code"
 msgstr ""
 
-#: ../qml/pages/Info.qml:101
+#: ../qml/pages/Info.qml:123
 msgid "Released under the terms of the GNU GPL v3"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:23
+#: ../qml/pages/Info.qml:132 ../qml/pages/headers/MainHeader.qml:38
+msgid "Info"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:58
+msgid "Bad passphrase"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:61
+msgid "No valid key found"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:64
+msgid "Decryption failed"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:98
+msgid "No password found"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:111
+msgid "You can import a password store by cloning or"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:118
+msgid "importing a password store zip in the settings"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:195
+msgid "Decryption failed !"
+msgstr ""
+
+#: ../qml/pages/PasswordList.qml:219
 msgid "Back"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:43
-msgid ""
-"No password found<br>You can import a password store zip in the settings"
-msgstr ""
-
-#: ../qml/pages/headers/MainHeader.qml:8 ../qml/pages/headers/StackHeader.qml:8
-#: UTPass.desktop.in.h:1
+#: ../qml/pages/PasswordList.qml:226 ../qml/pages/headers/MainHeader.qml:14
+#: ../qml/pages/headers/StackHeader.qml:9 UTPass.desktop.in.h:1
 msgid "UTPass"
 msgstr ""
 
-#: ../qml/pages/headers/MainHeader.qml:23
+#: ../qml/pages/headers/MainHeader.qml:20
+#: ../qml/pages/headers/MainHeader.qml:62
 msgid "Search"
 msgstr ""
 
-#: ../qml/pages/headers/MainHeader.qml:51 ../qml/pages/settings/Settings.qml:14
+#: ../qml/pages/headers/MainHeader.qml:31 ../qml/pages/settings/Settings.qml:73
 msgid "Settings"
 msgstr ""
 
-#: ../qml/pages/settings/ImportKeyFile.qml:17
+#: ../qml/pages/settings/DeleteRepo.qml:43
+#: ../qml/pages/settings/DeleteRepo.qml:93
+#: ../qml/pages/settings/Settings.qml:56
+msgid "Delete Password Store"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:56
+msgid "You're are about to delete<br>the current Password Store.<br>Continue ?"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:57
+#: ../qml/pages/settings/ImportGitClone.qml:169
+#: ../qml/pages/settings/ImportZip.qml:66
+#: ../qml/pages/settings/InfoKeys.qml:174
+msgid "Yes"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:70
+msgid "Password Store removal failed !"
+msgstr ""
+
+#: ../qml/pages/settings/DeleteRepo.qml:79
+msgid "Password Store deleted !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:56
+msgid "An unexpected error occurred during the clone operation."
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:59
+msgid "Invalid URL for the current clone operation."
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:62
+msgid "Username is missing in the URL."
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:65
+msgid "Authentication error, credentials may be invalid."
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:68
+msgid ""
+"Credentials type does not match the URL for the current clone operation."
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:168
+msgid ""
+"Importing a git repo will delete<br>any existing password store!"
+"<br>Continue ?"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:182
+msgid "An error occured during git clone !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:192
+#: ../qml/pages/settings/ImportZip.qml:88
+msgid "Password store sucessfully imported !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:204
+msgid "Git Clone Import"
+msgstr ""
+
+#: ../qml/pages/settings/ImportKeyFile.qml:9
 msgid "GPG Key Import"
 msgstr ""
 
-#: ../qml/pages/settings/ImportKeyFile.qml:69
-msgid "Key import failed !"
-msgstr ""
-
-#: ../qml/pages/settings/ImportKeyFile.qml:76
+#: ../qml/pages/settings/ImportKeyFile.qml:10
 msgid "Key successfully imported !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:17
-msgid "Zip Password Store Import"
+#: ../qml/pages/settings/ImportKeyFile.qml:11
+msgid "Key import failed !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:72
+#: ../qml/pages/settings/ImportKeyFile.qml:35
+msgid "The file is not in a valid key format"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:12
+msgid "SSH Key Import"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:13
+msgid "SSH Key successfully imported !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:14
+msgid "SSH Key import failed !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportZip.qml:65
 msgid ""
 "Importing a new zip will delete<br>any existing password store!<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:82
+#: ../qml/pages/settings/ImportZip.qml:79
 msgid "Password store import failed !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:89
-msgid "Password store sucessfully imported !"
+#: ../qml/pages/settings/ImportZip.qml:100
+msgid "Zip Password Store Import"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:16
-msgid "Info Keys"
+#: ../qml/pages/settings/InfoKeys.qml:47
+msgid "No key found"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:44
-msgid "Key id : %1"
+#: ../qml/pages/settings/InfoKeys.qml:83
+msgid "Key ID :"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:49
+#: ../qml/pages/settings/InfoKeys.qml:124
+msgid "User IDs : "
+msgstr ""
+
+#: ../qml/pages/settings/InfoKeys.qml:151
 msgid "Delete this key"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:68
-msgid "You're are about to delete<br>%1<br>Continue ?"
+#: ../qml/pages/settings/InfoKeys.qml:173
+msgid "You're are about to delete<br>%1.<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:71
-msgid "%1<br>will be definitively removed.<br>Continue ?"
-msgstr ""
-
-#: ../qml/pages/settings/InfoKeys.qml:87
+#: ../qml/pages/settings/InfoKeys.qml:187
 msgid "Key removal failed !"
 msgstr ""
 
-#: ../qml/pages/settings/InfoKeys.qml:94
+#: ../qml/pages/settings/InfoKeys.qml:196
 msgid "Key successfully deleted !"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:28
+#: ../qml/pages/settings/InfoKeys.qml:208
+msgid "An Error occured getting GPG keys !"
+msgstr ""
+
+#: ../qml/pages/settings/InfoKeys.qml:216
+msgid "Info Keys"
+msgstr ""
+
+#: ../qml/pages/settings/Settings.qml:21
 msgid "GPG"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:32
+#: ../qml/pages/settings/Settings.qml:27
 msgid "Import a GPG key file"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:36
+#: ../qml/pages/settings/Settings.qml:32
 msgid "Show GPG keys"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:43
+#: ../qml/pages/settings/Settings.qml:40
 msgid "Password Store"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:47
+#: ../qml/pages/settings/Settings.qml:46
+msgid "Import a Password Store using Git"
+msgstr ""
+
+#: ../qml/pages/settings/Settings.qml:51
 msgid "Import a Password Store Zip"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:56
+#: ../qml/pages/settings/Settings.qml:65
 msgid "Warning: importing delete any exiting Password Store"
 msgstr ""

qml/Main.qml

@@ -1,49 +1,52 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
 import Pass 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import "dialogs"
 
 MainView {
+    //theme.name: "Lomiri.Components.Themes.SuruDark"
+
     id: root
-    objectName: "mainView"
-    applicationName: "utpass.qrouland"
-
-    automaticOrientation: false
-
-    width: units.gu(48)
-    height: units.gu(80)
-
-    signal responsePassphraseDialog(bool canceled, string passphrase)
 
     function initPass(rootView) {
-        Pass.init(rootView)
+        Pass.initialize(rootView);
         pageStack.push(Qt.resolvedUrl("pages/PasswordList.qml"));
     }
 
     function callPassphraseDialog(useridHint, description, previousWasBad) {
         //TODO use parameters to impove passphrase dialog
-        var passphraseDialog = PopupUtils.open(
-                    Qt.resolvedUrl("dialogs/PassphraseDialog.qml"))
-        passphraseDialog.activateFocus()
-
-        var validated = function (passphrase) {
-            responsePassphraseDialog(false, passphrase)
-        }
-
-        var canceled = function () {
-            responsePassphraseDialog(true, "")
-        }
-
-        passphraseDialog.validated.connect(validated)
-        passphraseDialog.canceled.connect(canceled)
+        var pop = PopupUtils.open(passphraseDialog);
+        pop.activateFocus();
     }
 
+    objectName: "mainView"
+    applicationName: "utpass.qrouland"
+    automaticOrientation: true
+    width: units.gu(45)
+    height: units.gu(75)
+
     PageStack {
         id: pageStack
-        anchors.fill: parent
 
-        Component.onCompleted: {}
+        anchors.fill: parent
     }
+
+    Component {
+        id: passphraseDialog
+
+        PassphraseDialog {
+            onValidated: {
+                console.info("valided");
+                Pass.responsePassphraseDialog(false, passphrase);
+            }
+            onCanceled: {
+                console.info("canceled");
+                Pass.responsePassphraseDialog(true, "");
+            }
+        }
+
+    }
+
 }

qml/components/CopyText.qml

@@ -1,11 +1,11 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
 import "../styles"
+import Lomiri.Components 1.3
+import QtQuick 2.4
 
 Item {
     id: copyText
-    property string text
 
+    property string text
     property bool commonBorder: true
     property int lBorderwidth: 0
     property int rBorderwidth: 0
@@ -19,12 +19,14 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
             text: copyText.text
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
@@ -39,20 +41,21 @@ Item {
         MouseArea {
             anchors.fill: parent
             onPressed: {
-                parent.color = LomiriColors.warmGrey
+                parent.color = LomiriColors.warmGrey;
             }
             onClicked: {
-                var mimeData = Clipboard.newData()
-                mimeData.text = copyText.text
-                Clipboard.push(mimeData)
+                var mimeData = Clipboard.newData();
+                mimeData.text = copyText.text;
+                Clipboard.push(mimeData);
             }
             onReleased: {
-                parent.color = theme.palette.normal.background
+                parent.color = theme.palette.normal.background;
             }
         }
 
         CustomBorder {
             id: cb
+
             commonBorder: copyText.commonBorder
             lBorderwidth: copyText.lBorderwidth
             rBorderwidth: copyText.rBorderwidth
@@ -60,5 +63,7 @@ Item {
             bBorderwidth: copyText.bBorderwidth
             borderColor: copyText.borderColor
         }
+
     }
+
 }

qml/components/ExternalLink.qml

@@ -1,13 +1,12 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
 import "../styles"
+import Lomiri.Components 1.3
+import QtQuick 2.4
 
 Item {
     id: externalLink
 
     property string url
     property string text
-
     property bool commonBorder: true
     property int lBorderwidth: 0
     property int rBorderwidth: 0
@@ -21,12 +20,14 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
             text: externalLink.text
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
@@ -42,12 +43,13 @@ Item {
         MouseArea {
             anchors.fill: parent
             onClicked: {
-                Qt.openUrlExternally(externalLink.url)
+                Qt.openUrlExternally(externalLink.url);
             }
         }
 
         CustomBorder {
             id: cb
+
             commonBorder: externalLink.commonBorder
             lBorderwidth: externalLink.lBorderwidth
             rBorderwidth: externalLink.rBorderwidth
@@ -55,5 +57,7 @@ Item {
             bBorderwidth: externalLink.bBorderwidth
             borderColor: externalLink.borderColor
         }
+
     }
+
 }

qml/components/FileDir.qml

@@ -1,24 +1,42 @@
-import QtQuick 2.4
+import "../dialogs"
+import "../styles"
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import Lomiri.Components.Themes 1.3
 import Pass 1.0
-import "../styles"
-import "../dialogs"
+import QtQuick 2.4
+
+Item {
+    //property string folder
+
+    id: fileDir
+
+    property string fName
+    property bool fIsDir
+    property bool commonBorder: true
+    property int lBorderwidth: 0
+    property int rBorderwidth: 0
+    property int tBorderwidth: 0
+    property int bBorderwidth: 0
+    property int commonBorderWidth: 0
+    property string borderColor: LomiriColors.warmGrey
+
+    signal clicked()
+
+    anchors.right: parent.right
+    anchors.left: parent.left
+    height: units.gu(5)
 
-Component {
     Rectangle {
-        id: fileDir
-        property string activePasswordName
-
-        anchors.right: parent.right
-        anchors.left: parent.left
-        height: units.gu(5)
+        anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
-            text: fileBaseName
+            text: fileDir.fIsDir ? fileDir.fName : fileDir.fName.slice(0, -4) // remove .gpg if it's a file
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
@@ -26,53 +44,38 @@ Component {
             anchors.verticalCenter: parent.verticalCenter
             anchors.rightMargin: units.gu(2)
             height: units.gu(4)
-            name: fileIsDir ? "go-next" : "lock"
+            name: fileDir.fIsDir ? "go-next" : "lock"
             color: LomiriColors.orange
         }
 
         MouseArea {
+            // onClicked: {
+            //     var path = fileDir.fdfolder + "/" + fileName;
+            //     if (fileIsDir) {
+            //         fileDir.fdfolder = path;
+            //         //backAction.visible = true;
+            //         // passwordListHeader.title = fileName;
+            //     } else {
+            //         console.debug("pass show %1".arg(path));
+            //         Pass.show(path);
+            //     }
+            // }
+
             anchors.fill: parent
-            onClicked: {
-                if (fileIsDir) {
-                    folderModel.folder = folderModel.folder + "/" + fileName
-                    backAction.visible = true
-                } else {
-                    fileDir.activePasswordName = fileBaseName
-
-                    Pass.onDecrypted.connect(function (text) {
-                        pageStack.push(Qt.resolvedUrl("../pages/Password.qml"),
-                                       {
-                                           "plainText": text,
-                                           "title": fileDir.activePasswordName
-                                       })
-                    })
-
-                    Pass.onDecryptFailed.connect(function () {
-                        PopupUtils.open(passwordPageDecryptError)
-                    })
-
-                    Pass.decrypt(folderModel.folder + "/" + fileName)
-                }
-            }
+            onClicked: fileDir.clicked()
         }
 
         CustomBorder {
-            commonBorder: false
-            lBorderwidth: 0
-            rBorderwidth: 0
-            tBorderwidth: 0
-            bBorderwidth: 1
-            borderColor: LomiriColors.warmGrey
+            id: cb
+
+            commonBorder: fileDir.commonBorder
+            lBorderwidth: fileDir.lBorderwidth
+            rBorderwidth: fileDir.rBorderwidth
+            tBorderwidth: fileDir.tBorderwidth
+            bBorderwidth: fileDir.bBorderwidth
+            borderColor: fileDir.borderColor
         }
 
-        Component {
-            id: passwordPageDecryptError
-            ErrorDialog {
-                textError: i18n.tr("Decryption failed !")
-                onDialogClosed: {
-                    pageStack.pop()
-                }
-            }
-        }
     }
+
 }

qml/components/GitCloneHttp.qml

@@ -0,0 +1,53 @@
+import Git 1.0
+import Lomiri.Components 1.3
+import Pass 1.0
+import QtQuick 2.4
+
+Column {
+    signal repoUrlChanged(string url)
+
+    function setRepoUrl(url) {
+        repoUrlInput.text = url;
+    }
+
+    width: parent.width
+    spacing: units.gu(1)
+
+    Text {
+        id: repoUrlLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('Repo Url')
+        color: theme.palette.normal.backgroundText
+    }
+
+    TextField {
+        id: repoUrlInput
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        placeholderText: "http(s)://<hostname>"
+        onTextChanged: repoUrlChanged(repoUrlInput.text)
+    }
+
+    Rectangle {
+        width: parent.width
+        height: units.gu(1)
+        color: theme.palette.normal.background
+    }
+
+    Button {
+        id: buttonClone
+
+        width: parent.width
+        color: theme.palette.normal.positive
+        text: i18n.tr('Clone')
+        onClicked: {
+            Git.cloneHttp(repoUrlInput.text, Pass.password_store);
+        }
+    }
+
+}

qml/components/GitCloneHttpAuth.qml

@@ -0,0 +1,73 @@
+import Git 1.0
+import Lomiri.Components 1.3
+import Pass 1.0
+import QtQuick 2.4
+
+Column {
+    signal repoUrlChanged(string url)
+
+    function setRepoUrl(url) {
+        repoUrlInput.text = url;
+    }
+
+    anchors.top: parent.fill
+    spacing: units.gu(1)
+
+    Text {
+        id: repoUrlLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('Repo Url')
+        color: theme.palette.normal.backgroundText
+    }
+
+    TextField {
+        id: repoUrlInput
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        placeholderText: "http(s)://<username>@<hostname>"
+        onTextChanged: repoUrlChanged(repoUrlInput.text)
+    }
+
+    Text {
+        id: repoPasswordLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('Password')
+        color: theme.palette.normal.backgroundText
+    }
+
+    TextField {
+        id: repoPasswordInput
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        echoMode: TextInput.Password
+        placeholderText: i18n.tr('Password')
+    }
+
+    Rectangle {
+        width: parent.width
+        height: units.gu(1)
+        color: theme.palette.normal.background
+    }
+
+    Button {
+        id: buttonClone
+
+        width: parent.width
+        color: theme.palette.normal.positive
+        text: i18n.tr('Clone')
+        onClicked: {
+            Git.cloneHttpPass(repoUrlInput.text, Pass.password_store, repoPasswordInput.text);
+        }
+    }
+
+}

qml/components/GitCloneSshKey.qml

@@ -0,0 +1,145 @@
+import Git 1.0
+import Lomiri.Components 1.3
+import Pass 1.0
+import QtQuick 2.4
+import Utils 1.0
+
+Column {
+    property alias importSshPrivKeyButton: repoImportPrivKeyButton
+    property alias importSshPubKeyButton: repoImportPubKeyButton
+    property alias deleteSshPrivKeyButton: repoDeletePrivKeyButton
+    property alias deleteSshPubKeyButton: repoDeletePubKeyButton
+    property bool __sshPrivKeyAvailable: false
+    property bool __sshPubKeyAvailable: false
+
+    signal repoUrlChanged(string url)
+
+    function setRepoUrl(url) {
+        repoUrlInput.text = url;
+    }
+
+    function update() {
+        __sshPrivKeyAvailable = Utils.fileExists(Git.privKey);
+        __sshPubKeyAvailable = Utils.fileExists(Git.pubKey);
+    }
+
+    Component.onCompleted: {
+        update();
+    }
+    anchors.top: parent.fill
+    spacing: units.gu(1)
+
+    Text {
+        id: repoUrlLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('Repo Url')
+        color: theme.palette.normal.backgroundText
+    }
+
+    TextField {
+        id: repoUrlInput
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        placeholderText: "<username>@<hostname>"
+        onTextChanged: repoUrlChanged(repoUrlInput.text)
+    }
+
+    Text {
+        id: repoPrivKeyLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('SSH private key')
+        color: theme.palette.normal.backgroundText
+    }
+
+    Button {
+        id: repoImportPrivKeyButton
+
+        width: parent.width
+        color: theme.palette.normal.positive
+        text: i18n.tr('Import SSH private key')
+        visible: !__sshPrivKeyAvailable
+    }
+
+    Button {
+        id: repoDeletePrivKeyButton
+
+        width: parent.width
+        color: theme.palette.normal.negative
+        text: i18n.tr('Delete SSH private key')
+        visible: __sshPrivKeyAvailable
+    }
+
+    Text {
+        id: repoPubKeyLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('SSH public key')
+        color: theme.palette.normal.backgroundText
+    }
+
+    Button {
+        id: repoDeletePubKeyButton
+
+        width: parent.width
+        color: theme.palette.normal.negative
+        text: i18n.tr('Delete SSH public key')
+        visible: __sshPrivKeyAvailable
+    }
+
+    Button {
+        id: repoImportPubKeyButton
+
+        width: parent.width
+        color: theme.palette.normal.positive
+        text: i18n.tr('Import SSH public key')
+        visible: !__sshPrivKeyAvailable
+    }
+
+    Text {
+        id: repoPassphraseLabel
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        text: i18n.tr('Passphrase')
+        color: theme.palette.normal.backgroundText
+    }
+
+    TextField {
+        id: repoPassphraseInput
+
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        width: parent.width
+        echoMode: TextInput.Password
+        placeholderText: i18n.tr('Passphrase')
+    }
+
+    Rectangle {
+        width: parent.width
+        height: units.gu(1)
+        color: theme.palette.normal.background
+    }
+
+    Button {
+        id: buttonClone
+
+        width: parent.width
+        color: theme.palette.normal.positive
+        text: i18n.tr('Clone')
+        onClicked: {
+            Git.cloneSshKey(repoUrlInput.text, Pass.password_store, repoPassphraseInput.text);
+        }
+    }
+
+}

qml/components/ImportFile.qml

@@ -0,0 +1,48 @@
+import "../pages/headers"
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Lomiri.Content 1.3
+import Pass 1.0
+import QtQuick 2.4
+import Utils 1.0
+
+Page {
+    id: importKeyFilePage
+
+    property var activeTransfer
+    property alias contentPicker: contentPicker
+    property string headerTitle: i18n.tr("Import succeeded !")
+    property string dialogErrorTxt: i18n.tr("Import failed !")
+    property string dialogErrorDescriptionTxt: null
+    property string dialogSuccessTxt: i18n.tr("File Imported")
+
+    ContentPeerPicker {
+        id: contentPicker
+
+        anchors.top: importKeyHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.topMargin: importKeyFilePage.header.height
+        width: parent.width
+        visible: parent.visible
+        showTitle: false
+        contentType: ContentType.Text
+        handler: ContentHandler.Source
+        onCancelPressed: {
+            pageStack.pop();
+        }
+    }
+
+    ContentTransferHint {
+        id: transferHint
+
+        anchors.fill: parent
+        activeTransfer: importKeyFilePage.activeTransfer
+    }
+
+    header: StackHeader {
+        id: importKeyHeader
+
+        title: importKeyFilePage.headerTitle
+    }
+
+}

qml/components/PageStackLink.qml

@@ -1,16 +1,14 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
 import "../styles"
+import Lomiri.Components 1.3
+import QtQuick 2.4
 
 Item {
     id: pageStackLink
 
     property string page
     property var params: {
-
     }
     property string text
-
     property bool commonBorder: true
     property int lBorderwidth: 0
     property int rBorderwidth: 0
@@ -24,12 +22,14 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        color: theme.palette.normal.background
 
         Text {
             text: pageStackLink.text
             anchors.left: parent.left
             anchors.leftMargin: units.gu(2)
             anchors.verticalCenter: parent.verticalCenter
+            color: theme.palette.normal.backgroundText
         }
 
         Icon {
@@ -45,12 +45,13 @@ Item {
         MouseArea {
             anchors.fill: parent
             onClicked: {
-                pageStack.push(page, params)
+                pageStack.push(page, params);
             }
         }
 
         CustomBorder {
             id: cb
+
             commonBorder: pageStackLink.commonBorder
             lBorderwidth: pageStackLink.lBorderwidth
             rBorderwidth: pageStackLink.rBorderwidth
@@ -58,5 +59,7 @@ Item {
             bBorderwidth: pageStackLink.bBorderwidth
             borderColor: pageStackLink.borderColor
         }
+
     }
+
 }

qml/dialogs/DoubleValidationDialog.qml

@@ -1,52 +0,0 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
-import Lomiri.Components.Popups 1.3
-
-Dialog {
-    id: doubleValidationDialog
-
-    property int nb_validation: 0
-    property string text1
-    property string text2
-
-    signal doubleValidated
-    signal canceled
-
-    Text {
-        visible: nb_validation == 0
-        horizontalAlignment: Text.AlignHCenter
-        text: text1
-    }
-
-    Text {
-        visible: nb_validation == 1
-        horizontalAlignment: Text.AlignHCenter
-        text: text2
-    }
-
-    Button {
-        text: i18n.tr("Ok")
-        color: LomiriColors.green
-
-        onClicked: {
-            if (nb_validation == 1) {
-                nb_validation = 0
-                doubleValidated()
-                PopupUtils.close(doubleValidationDialog)
-            } else {
-                nb_validation += 1
-            }
-        }
-    }
-
-    Button {
-        id: cancelButton
-        text: i18n.tr("Cancel")
-        color: LomiriColors.red
-        onClicked: {
-            nb_validation = 0
-            canceled()
-            PopupUtils.close(doubleValidationDialog)
-        }
-    }
-}

qml/dialogs/ErrorDialog.qml

@@ -1,22 +1,24 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import QtQuick 2.4
 
 Dialog {
-    id: dialogSuccess
+    id: dialog
 
     property string textError
+    property string textErrorDescription: null
 
-    signal dialogClosed
+    signal dialogClosed()
 
     title: i18n.tr("Error !")
-    text: textError
+    text: textErrorDescription ? (textError + "<br>" + textErrorDescription) : textError
+
     Button {
-        text: i18n.tr("OK")
-        color: LomiriColors.red
-        onClicked: function () {
-            dialogClosed()
-            PopupUtils.close(dialogSuccess)
+        text: i18n.tr("Close")
+        onClicked: function() {
+            dialogClosed();
+            PopupUtils.close(dialog);
         }
     }
+
 }

qml/dialogs/PassphraseDialog.qml

@@ -1,25 +1,25 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import QtQuick 2.4
 
 Dialog {
-    id: passphraseProvider
-    title: i18n.tr("Authentication required")
-    text: i18n.tr("Enter passphrase:")
+    id: dialog
 
     signal validated(string passphrase)
-    signal canceled
+    signal canceled()
 
     function activateFocus() {
-        passphraseField.forceActiveFocus()
+        passphraseField.forceActiveFocus();
     }
 
+    title: i18n.tr("Authentication required")
+    text: i18n.tr("Enter passphrase:")
+
     TextField {
         id: passphraseField
 
         placeholderText: i18n.tr("passphrase")
         echoMode: TextInput.Password
-
         onAccepted: okButton.clicked(text)
     }
 
@@ -27,24 +27,22 @@ Dialog {
         id: okButton
 
         text: i18n.tr("Ok")
-        color: LomiriColors.green
-
+        color: theme.palette.normal.positive
         onClicked: {
-            validated(passphraseField.text)
-            passphraseField.text = ""
-            PopupUtils.close(passphraseProvider)
+            validated(passphraseField.text);
+            passphraseField.text = "";
+            PopupUtils.close(dialog);
         }
     }
 
     Button {
         id: cancelButton
+
         text: i18n.tr("Cancel")
-
-        color: LomiriColors.red
-
         onClicked: {
-            canceled()
-            PopupUtils.close(passphraseProvider)
+            canceled();
+            PopupUtils.close(dialog);
         }
     }
+
 }

qml/dialogs/SimpleValidationDialog.qml

@@ -1,37 +1,35 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import QtQuick 2.4
 
 Dialog {
-    id: doubleValidationDialog
+    id: dialog
 
-    property string text
+    property string continueText: i18n.tr("Ok")
+    property color continueColor: theme.palette.normal.positive
 
-    signal validated
-    signal canceled
-
-    Text {
-        horizontalAlignment: Text.AlignHCenter
-        text: doubleValidationDialog.text
-    }
+    signal validated()
+    signal canceled()
 
     Button {
-        text: i18n.tr("Ok")
-        color: LomiriColors.green
+        id: continueButton
 
+        text: dialog.continueText
+        color: dialog.continueColor
         onClicked: {
-            validated()
-            PopupUtils.close(doubleValidationDialog)
+            validated();
+            PopupUtils.close(dialog);
         }
     }
 
     Button {
         id: cancelButton
+
         text: i18n.tr("Cancel")
-        color: LomiriColors.red
         onClicked: {
-            canceled()
-            PopupUtils.close(doubleValidationDialog)
+            canceled();
+            PopupUtils.close(dialog);
         }
     }
+
 }

qml/dialogs/SuccessDialog.qml

@@ -1,22 +1,23 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import QtQuick 2.4
 
 Dialog {
-    id: dialogSuccess
+    id: dialog
 
     property string textSuccess
 
-    signal dialogClosed
+    signal dialogClosed()
 
     title: i18n.tr("Success !")
     text: textSuccess
+
     Button {
         text: i18n.tr("OK")
-        color: LomiriColors.green
-        onClicked: function () {
-            dialogClosed()
-            PopupUtils.close(dialogSuccess)
+        onClicked: function() {
+            dialogClosed();
+            PopupUtils.close(dialog);
         }
     }
+
 }

qml/pages/Info.qml

@@ -1,14 +1,20 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
-import "headers"
 import "../components"
+import Lomiri.Components 1.3
+import QtQuick 2.4
+import Utils 1.0
+import "headers"
 
 Page {
     id: infoPage
 
-    header: StackHeader {
-        id: infoHeader
-        title: i18n.tr('Info')
+    Component.onCompleted: {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", Utils.manifestPath(), false);
+        xhr.send();
+        var mJson = JSON.parse(xhr.responseText);
+        manifestTitle.text = "<b>" + mJson.title + "</b>";
+        manifestVersion.text = mJson.version + "<br>" + mJson.framework + "@" + mJson.architecture;
+        manifestMaintener.text = mJson.maintainer;
     }
 
     Flow {
@@ -20,27 +26,33 @@ Page {
         Rectangle {
             width: parent.width
             height: units.gu(1)
+            color: theme.palette.normal.background
         }
 
         Text {
             id: manifestTitle
+
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             width: parent.width
             height: units.gu(8)
             fontSizeMode: Text.Fit
             font.pixelSize: 144
+            color: theme.palette.normal.backgroundText
         }
 
         Rectangle {
             width: parent.width
             height: units.gu(12)
+            color: theme.palette.normal.background
+
             Image {
                 source: "../../assets/logo.svg"
                 width: units.gu(12)
                 height: units.gu(12)
                 anchors.horizontalCenter: parent.horizontalCenter
             }
+
         }
 
         Text {
@@ -50,15 +62,18 @@ Page {
             text: i18n.tr("<b>Version</b>")
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
             id: manifestVersion
+
             horizontalAlignment: Text.AlignHCenter
             width: parent.width
             height: units.gu(4)
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
@@ -68,16 +83,20 @@ Page {
             text: i18n.tr("<b>Maintainer</>")
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
 
         Text {
             id: manifestMaintener
+
             horizontalAlignment: Text.AlignHCenter
             width: parent.width
             height: units.gu(2)
             fontSizeMode: Text.Fit
             font.pixelSize: 72
+            color: theme.palette.normal.backgroundText
         }
+
     }
 
     Flow {
@@ -85,32 +104,32 @@ Page {
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
+
         ExternalLink {
-            url: "https://taiga.rdrive.ovh/project/utpass/issues"
+            url: "https://github.com/QRouland/UTPass/issues"
             text: i18n.tr("Suggest improvement(s) or report a bug(s)")
         }
+
         ExternalLink {
-            url: "https://git.rdrive.ovh/QRouland/UTPass"
+            url: "https://github.com/QRouland/UTPass"
             text: i18n.tr("Access to the source code")
         }
+
         Text {
             width: parent.width
             height: units.gu(2)
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             text: i18n.tr("Released under the terms of the GNU GPL v3")
+            color: theme.palette.normal.backgroundText
         }
+
     }
 
-    Component.onCompleted: {
-        var xhr = new XMLHttpRequest()
-        xhr.open("GET", "../../manifest_.json", false)
-        xhr.send()
+    header: StackHeader {
+        id: infoHeader
 
-        var mJson = JSON.parse(xhr.responseText)
-
-        manifestTitle.text = "<b>" + mJson.title + "</b>"
-        manifestVersion.text = mJson.version + "<br>" + mJson.framework + "@" + mJson.architecture
-        manifestMaintener.text = mJson.maintainer
+        title: i18n.tr('Info')
     }
+
 }

qml/pages/Password.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
+import QtQuick 2.4
 import "headers"
 
 Page {
@@ -10,38 +10,15 @@ Page {
     property string plainText
     property var objects
 
-    header: PageHeader {
-        id: passwordPageHeader
-        width: parent.width
-        height: units.gu(6)
-        title: passwordPage.title
-
-        contents: Item {
-            height: parent.height
-            width: parent.width
-            Label {
-                id: labelTitle
-                text: passwordPage.title
-                anchors.verticalCenter: parent.verticalCenter
+    Component.onCompleted: {
+        var text_split = passwordPage.plainText.split('\n');
+        var component = Qt.createComponent("../components/CopyText.qml");
+        for (var i = 0; i < text_split.length; i++) {
+            if (text_split[i]) {
+                var object = component.createObject(container);
+                object.text = text_split[i];
             }
         }
-
-        leadingActionBar.height: units.gu(4)
-        leadingActionBar.actions: [
-            Action {
-                id: backAction
-                iconName: "back"
-                text: "Back"
-                onTriggered: {
-                    passwordPage.plainText = ""
-                    for (var object in objects) {
-                        object.text = ""
-                        object.destroy()
-                    }
-                    pageStack.pop()
-                }
-            }
-        ]
     }
 
     Rectangle {
@@ -49,21 +26,53 @@ Page {
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
+        color: theme.palette.normal.background
 
         Flow {
             id: container
+
             anchors.fill: parent
         }
+
     }
 
-    Component.onCompleted: {
-        var text_split = passwordPage.plainText.split('\n')
-        var component = Qt.createComponent("../components/CopyText.qml")
-        for (var i = 0; i < text_split.length; i++) {
-            if (text_split[i]) {
-                var object = component.createObject(container)
-                object.text = text_split[i]
+    header: PageHeader {
+        id: passwordPageHeader
+
+        width: parent.width
+        height: units.gu(6)
+        title: passwordPage.title
+        leadingActionBar.height: units.gu(4)
+        leadingActionBar.actions: [
+            Action {
+                id: backAction
+
+                iconName: "back"
+                text: "Back"
+                onTriggered: {
+                    passwordPage.plainText = null;
+                    for (var object in objects) {
+                        object.text = null;
+                        object.destroy();
+                    }
+                    pageStack.pop();
+                }
             }
+        ]
+
+        contents: Item {
+            height: parent.height
+            width: parent.width
+
+            Label {
+                id: labelTitle
+
+                text: passwordPage.title
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
         }
+
     }
+
 }

qml/pages/PasswordList.qml

@@ -1,72 +1,238 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
-import Qt.labs.folderlistmodel 2.1
-import Pass 1.0
 import "../components"
+import "../dialogs"
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Pass 1.0
+import Qt.labs.folderlistmodel 2.1
+import QtQuick 2.4
 import "headers"
 
 Page {
     id: passwordListPage
 
-    property string passwordStorePath
+    property string __passwordStorePath
+    property var __passwords
+    property string __text_error_description: null
+
+    function __searchPasswords(filter) {
+        var ret = [];
+        if (__passwords) {
+            for (var i = 0; i < __passwords.length; i++) {
+                if (__passwords[i].toUpperCase().indexOf(filter.toUpperCase()) > -1)
+                    ret.push(__passwords[i]);
+
+            }
+        }
+        return ret;
+    }
+
+    function __searchUpdateModel() {
+        const filter = passwordListHeader.searchBar.text;
+        console.info("filter : %1".arg(filter));
+        var ret = __searchPasswords(filter);
+        passwordListSearch.model.clear();
+        for (var i = 0; i < ret.length; i++) {
+            if (ret[i])
+                passwordListSearch.model.append({
+                "fileName": ret[i]
+            });
+
+        }
+    }
 
     anchors.fill: parent
+    Component.onCompleted: {
+        passwordListPage.__passwordStorePath = "file:" + Pass.password_store;
+        Pass.onShowSucceed.connect(function(filename, text) {
+            pageStack.push(Qt.resolvedUrl("../pages/Password.qml"), {
+                "plainText": text,
+                "title": filename
+            });
+        });
+        Pass.onShowFailed.connect(function(code, message) {
+            switch (code) {
+            case 1:
+                // UnexceptedError -> use the default (not translate) rnp error
+                __text_error_description = message;
+                break;
+            case 2:
+                // BadPassphrase
+                __text_error_description = i18n.tr("Bad passphrase");
+                break;
+            case 3:
+                // NoKeyFound
+                __text_error_description = i18n.tr("No valid key found");
+                break;
+            case 3:
+                // DecryptFailed
+                __text_error_description = i18n.tr("Decryption failed");
+                break;
+            default:
+                console.warn("Unhandled error code");
+                __text_error_description = message;
+                break;
+            }
+            PopupUtils.open(passwordPageDecryptError);
+        });
+        Pass.onLsSucceed.connect(function(passwords) {
+            passwordListPage.__passwords = passwords;
+            __searchUpdateModel();
+        });
+        Pass.ls();
+    }
+
+    Column {
+        id: passwordListEmpty
+
+        anchors.top: passwordListHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+        visible: passwordListNav.model.count === 0
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+            color: theme.palette.normal.background
+        }
+
+        Text {
+            text: i18n.tr("No password found")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+            color: theme.palette.normal.backgroundText
+        }
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+            color: theme.palette.normal.background
+        }
+
+        Text {
+            text: i18n.tr("You can import a password store by cloning or")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+            color: theme.palette.normal.backgroundText
+        }
+
+        Text {
+            text: i18n.tr("importing a password store zip in the settings")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+            color: theme.palette.normal.backgroundText
+        }
+
+    }
+
+    ListView {
+        id: passwordListNav
+
+        anchors.top: passwordListHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        spacing: 1
+        visible: passwordListNav.model.count !== 0 && !passwordListHeader.searchBar.visible
+
+        model: FolderListModel {
+            nameFilters: ["*.gpg"]
+            rootFolder: passwordListPage.__passwordStorePath
+            folder: passwordListPage.__passwordStorePath
+            showDirs: true
+        }
+
+        delegate: Component {
+            FileDir {
+                fName: fileName
+                fIsDir: fileIsDir
+                onClicked: {
+                    var path = passwordListNav.model.folder + "/" + fileName;
+                    if (fileIsDir) {
+                        passwordListNav.model.folder = path;
+                        backAction.visible = true;
+                        passwordListHeader.title = fileName;
+                    } else {
+                        console.debug("pass show %1".arg(path));
+                        Pass.show(path);
+                    }
+                }
+            }
+
+        }
+
+    }
+
+    ListView {
+        id: passwordListSearch
+
+        anchors.top: passwordListHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        visible: passwordListNav.model.count !== 0 && passwordListHeader.searchBar.visible
+
+        model: ListModel {
+        }
+
+        delegate: Component {
+            FileDir {
+                fName: fileName
+                fIsDir: false
+                onClicked: {
+                    var path = passwordListPage.__passwordStorePath + "/" + fileName;
+                    console.debug("pass show %1".arg(path));
+                    Pass.show(path);
+                }
+            }
+
+        }
+
+    }
+
+    Component {
+        id: passwordPageDecryptError
+
+        ErrorDialog {
+            textError: i18n.tr("Decryption failed !")
+            textErrorDescription: __text_error_description
+        }
+
+    }
+
+    Timer {
+        id: searchTimer
+
+        interval: 500
+        onTriggered: __searchUpdateModel()
+    }
 
     header: MainHeader {
         id: passwordListHeader
 
+        searchBar.onTextChanged: searchTimer.restart()
         leadingActionBar.height: units.gu(4)
         leadingActionBar.actions: [
             Action {
                 id: backAction
+
                 iconName: "back"
                 text: i18n.tr("Back")
                 visible: false
                 onTriggered: {
-                    folderModel.folder = folderModel.parentFolder
-                    if (folderModel.rootFolder === folderModel.folder) {
-                        backAction.visible = false
+                    passwordListNav.model.folder = passwordListNav.model.parentFolder;
+                    console.debug(passwordListNav.model.folder);
+                    if (passwordListNav.model.rootFolder === passwordListNav.model.folder) {
+                        backAction.visible = false;
+                        passwordListHeader.title = i18n.tr("UTPass");
+                    } else {
+                        passwordListHeader.title = folderModel.folder;
                     }
                 }
             }
         ]
     }
 
-    Rectangle {
-        anchors.top: passwordListHeader.bottom
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-        visible: folderModel.count == 0
-        Text {
-            text: i18n.tr(
-                      "No password found<br>You can import a password store zip in the settings")
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-
-    ListView {
-        anchors.top: passwordListHeader.bottom
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-        spacing: 1
-
-        model: FolderListModel {
-            id: folderModel
-            nameFilters: ["*.gpg"]
-            rootFolder: passwordStorePath
-            folder: passwordStorePath
-            showDirs: true
-        }
-        delegate: FileDir {
-            id: fileDelegate
-        }
-    }
-
-    Component.onCompleted: {
-        passwordStorePath = "file:" + Pass.getPasswordStore()
-    }
 }

qml/pages/headers/MainHeader.qml

@@ -1,64 +1,70 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
+import QtQuick 2.4
 
 PageHeader {
+    //property alias searchBarText: searchBar.text
+    //signal searchBarTextChanged(string text)
+
     id: mainHeader
+
+    property alias searchBar: searchBar
+
     width: parent.width
     height: units.gu(6)
     title: i18n.tr("UTPass")
-
-    contents: Item {
-        height: parent.height
-        width: parent.width
-        Label {
-            id: labelTitle
-            text: mainHeader.title
-            anchors.verticalCenter: parent.verticalCenter
-            visible: true
-        }
-        TextField {
-            id: searchBar
-            anchors.right: parent.right
-            anchors.left: parent.left
-            placeholderText: i18n.tr("Search")
-            height: units.gu(4)
-            visible: false
-            anchors.verticalCenter: parent.verticalCenter
-            onFocusChanged: {
-
-            }
-        }
-    }
-
     trailingActionBar.height: units.gu(4)
     trailingActionBar.numberOfSlots: 2
     trailingActionBar.actions: [
-
-
-        /*Action { TODO
-            iconName: "search"
+        Action {
+            iconName: !searchBar.visible ? "search" : "close"
             text: i18n.tr("Search")
             onTriggered: {
-                searchBar.visible = !searchBar.visible
-                labelTitle.visible = !searchBar.visible
-                if (searchBar.visible === true) {
-                    searchBar.focus = true
-                }
+                searchBar.visible = !searchBar.visible;
+                labelTitle.visible = !searchBar.visible;
+                if (searchBar.visible === true)
+                    searchBar.focus = true;
+
             }
-        },*/
+        },
         Action {
             iconName: "settings"
             text: i18n.tr("Settings")
             onTriggered: {
-                pageStack.push(Qt.resolvedUrl("../settings/Settings.qml"))
+                pageStack.push(Qt.resolvedUrl("../settings/Settings.qml"));
             }
         },
         Action {
             iconName: "info"
             text: i18n.tr("Info")
             onTriggered: {
-                pageStack.push(Qt.resolvedUrl("../Info.qml"))
+                pageStack.push(Qt.resolvedUrl("../Info.qml"));
             }
         }
     ]
+
+    contents: Item {
+        height: parent.height
+        width: parent.width
+
+        Label {
+            id: labelTitle
+
+            text: mainHeader.title
+            anchors.verticalCenter: parent.verticalCenter
+            visible: true
+        }
+
+        TextField {
+            id: searchBar
+
+            anchors.right: parent.right
+            anchors.left: parent.left
+            placeholderText: i18n.tr("Search")
+            height: units.gu(4)
+            visible: false
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+    }
+
 }

qml/pages/headers/StackHeader.qml

@@ -1,31 +1,36 @@
-import QtQuick 2.4
 import Lomiri.Components 1.3
+import QtQuick 2.4
 
 PageHeader {
     id: stackHeader
+
     width: parent.width
     height: units.gu(6)
     title: i18n.tr("UTPass")
-
-    contents: Item {
-        height: parent.height
-        width: parent.width
-        Label {
-            id: labelTitle
-            text: stackHeader.title
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-
     leadingActionBar.height: units.gu(4)
     leadingActionBar.actions: [
         Action {
             id: backAction
+
             iconName: "back"
             text: "Back"
             onTriggered: {
-                pageStack.pop()
+                pageStack.pop();
             }
         }
     ]
+
+    contents: Item {
+        height: parent.height
+        width: parent.width
+
+        Label {
+            id: labelTitle
+
+            text: stackHeader.title
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+    }
+
 }

qml/pages/settings/DeleteRepo.qml

@@ -0,0 +1,96 @@
+import "../../components"
+import "../../dialogs"
+import "../../settings"
+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)
+            color: theme.palette.normal.background
+        }
+
+        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: {
+                GitSettings.type = 0;
+                GitSettings.repoUrl = null;
+                pageStack.clear();
+                pageStack.push(Qt.resolvedUrl("../PasswordList.qml"));
+            }
+        }
+
+    }
+
+    header: StackHeader {
+        id: deleteRepoPageHeader
+
+        title: i18n.tr('Delete Password Store')
+    }
+
+}

qml/pages/settings/ImportGitClone.qml

@@ -0,0 +1,209 @@
+import "../../components"
+import "../../dialogs"
+import "../../settings"
+import "../headers"
+import Git 1.0
+import Lomiri.Components 1.3
+import Lomiri.Components.Pickers 1.3
+import Lomiri.Components.Popups 1.3
+import Pass 1.0
+import QtQuick 2.4
+import Utils 1.0
+
+Page {
+    // property int __gitModeSSH_KEY : 2
+
+    id: importGitClonePage
+
+    property int __gitModeHTTP: 0
+    property int __gitModeHTTP_AUTH: 1
+    property int __gitCloneErrorCodeSuccessful: 0
+    property int __gitCloneErrorCodeUnexpectedError: 1
+    property int __gitCloneErrorCodeInvalidUrl: 2
+    property int __gitCloneErrorCodeNoUsername: 3
+    property int __gitCloneErrorCodeAuthentificationError: 4
+    property int __gitCloneErrorCodeUrlTypeDoNotMatchCreds: 5
+    property string __repoUrl
+    property string __err_message: null
+
+    function __loadForm() {
+        // case __gitModeSSH_KEY:
+        //     importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneSshKey.qml");
+        //     break;
+
+        switch (combo.selectedIndex) {
+        case __gitModeHTTP:
+            importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttp.qml");
+            break;
+        case __gitModeHTTP_AUTH:
+            importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttpAuth.qml");
+            break;
+        }
+    }
+
+    Component.onCompleted: {
+        Git.cloneSucceed.connect(function() {
+            GitSettings.type = combo.selectedIndex;
+            GitSettings.repoUrl = importGitClonePage.__repoUrl;
+            if (GitSettings.type != __gitModeSSH_KEY) {
+                // ensure there no ssh key is kept if swicthing to another git mode
+                Utils.rmFile(Git.privKey);
+                Utils.rmFile(Git.pubKey);
+            }
+            PopupUtils.open(dialogGitCloneSuccess, importGitClonePage);
+        });
+        Git.cloneFailed.connect(function(err_code, msg) {
+            switch (err_code) {
+            case __gitCloneErrorCodeUnexpectedError:
+                __err_message = i18n.tr("An error occurred during the clone operation.");
+                break;
+            case __gitCloneErrorCodeInvalidUrl:
+                __err_message = i18n.tr("Invalid URL for the current clone operation.");
+                break;
+            case __gitCloneErrorCodeNoUsername:
+                __err_message = i18n.tr("Username is missing in the URL.");
+                break;
+            case __gitCloneErrorCodeAuthentificationError:
+                __err_message = i18n.tr("Authentication error, credentials may be invalid.");
+                break;
+            case __gitCloneErrorCodeUrlTypeDoNotMatchCreds:
+                __err_message = i18n.tr("Credentials type does not match the URL for the current clone operation.");
+                break;
+            default:
+                __err_message = msg;
+                break;
+            }
+            PopupUtils.open(dialogGitCloneError, importGitClonePage);
+        });
+        if (GitSettings.repoUrl)
+            __repoUrl = GitSettings.repoUrl;
+
+        if (GitSettings.type < combo.count && GitSettings.type > 0)
+            combo.selectedIndex = GitSettings.type;
+        else
+            combo.selectedIndex = 0;
+        __loadForm();
+        PopupUtils.open(importGitCloneValidation, importGitClonePage);
+    }
+
+    Column {
+        anchors.top: importGitCloneHeader.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+        spacing: units.gu(1)
+
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+            color: theme.palette.normal.background
+        }
+
+        OptionSelector {
+            id: combo
+
+            width: parent.width
+            model: ["HTTP", "HTTP AUTH"] //, "SSH KEY"]
+            onDelegateClicked: function(i) {
+                timer.setTimeout(function() {
+                    __loadForm();
+                }, 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.disconnect(cb); // This is important
+                        timer.triggered.disconnect(release); // This is important as well
+                    });
+                    timer.start();
+                }
+
+            }
+
+        }
+
+        Loader {
+            id: importGitCloneForm
+
+            width: parent.width
+            onLoaded: {
+                // case __gitModeSSH_KEY:
+                //     importGitCloneForm.item.importSshPrivKeyButton.clicked.connect(function() {
+                //         pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
+                //             "isPrivateKey": true
+                //         });
+                //     });
+                //     importGitCloneForm.item.importSshPubKeyButton.clicked.connect(function() {
+                //         pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
+                //             "isPrivateKey": false
+                //         });
+                //     });
+                //     break;
+
+                importGitCloneForm.item.repoUrlChanged.connect(function(url) {
+                    importGitClonePage.__repoUrl = url;
+                });
+                importGitCloneForm.item.setRepoUrl(importGitClonePage.__repoUrl);
+                switch (combo.selectedIndex) {
+                case __gitModeHTTP:
+                    break;
+                case __gitModeHTTP_AUTH:
+                    break;
+                }
+            }
+        }
+
+    }
+
+    Component {
+        id: importGitCloneValidation
+
+        SimpleValidationDialog {
+            text: i18n.tr("Importing a git repo will delete<br>any existing password store!<br>Continue ?")
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
+            onCanceled: {
+                pageStack.pop();
+            }
+        }
+
+    }
+
+    Component {
+        id: dialogGitCloneError
+
+        ErrorDialog {
+            textError: i18n.tr("An error occured during git clone !")
+            textErrorDescription: __err_message
+        }
+
+    }
+
+    Component {
+        id: dialogGitCloneSuccess
+
+        SuccessDialog {
+            textSuccess: i18n.tr("Password store sucessfully imported !")
+            onDialogClosed: {
+                pageStack.clear();
+                pageStack.push(Qt.resolvedUrl("../PasswordList.qml"));
+            }
+        }
+
+    }
+
+    header: StackHeader {
+        id: importGitCloneHeader
+
+        title: i18n.tr('Git Clone Import')
+    }
+
+}

qml/pages/settings/ImportKeyFile.qml

@@ -1,82 +1,105 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
-import Lomiri.Content 1.3
-import Lomiri.Components.Popups 1.3
-import Pass 1.0
-import Utils 1.0
-import "../headers"
 import "../../dialogs"
+import "../headers"
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Lomiri.Content 1.3
+import Pass 1.0
+import QtQuick 2.4
+import Utils 1.0
 
 Page {
     id: importKeyFilePage
 
     property var activeTransfer
-
-    header: StackHeader {
-        id: importKeyHeader
-        title: i18n.tr("GPG Key Import")
-    }
+    property alias contentPicker: contentPicker
+    property string __text_error_description: null
 
     ContentPeerPicker {
+        id: contentPicker
+
         anchors.top: importKeyHeader.bottom
         anchors.bottom: parent.bottom
         anchors.topMargin: importKeyFilePage.header.height
-
         width: parent.width
-
         visible: parent.visible
         showTitle: false
         contentType: ContentType.Text
         handler: ContentHandler.Source
-
         onPeerSelected: {
-            peer.selectionType = ContentTransfer.Single
-            importKeyFilePage.activeTransfer = peer.request()
-
-            importKeyFilePage.activeTransfer.stateChanged.connect(function () {
-                if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
-                    console.log("Charged")
-                    console.log(importKeyFilePage.activeTransfer.items[0].url)
-
-                    var status = Pass.gpgImportKeyFromFile(
-                                importKeyFilePage.activeTransfer.items[0].url)
-
-                    Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url)
-                    if (status) {
-                        PopupUtils.open(dialogImportKeyPageSucess)
-                    } else {
-                        PopupUtils.open(dialogImportKeyPageError)
+            {
+                importKeyFilePage.contentPicker.peer.selectionType = ContentTransfer.Single;
+                importKeyFilePage.activeTransfer = importKeyFilePage.contentPicker.peer.request();
+                importKeyFilePage.activeTransfer.stateChanged.connect(function() {
+                    if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
+                        console.log("Charged");
+                        console.log(importKeyFilePage.activeTransfer.items[0].url);
+                        Pass.importGPGKey(importKeyFilePage.activeTransfer.items[0].url);
+                        Pass.importGPGKeySucceed.connect(function() {
+                            Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
+                            importKeyFilePage.activeTransfer = null;
+                            PopupUtils.open(dialogImportKeyPageSucess);
+                        });
+                        Pass.importGPGKeyFailed.connect(function(err, message) {
+                            Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
+                            importKeyFilePage.activeTransfer = null;
+                            switch (code) {
+                            case 1:
+                                // UnexceptedError -> use the default (not translate) rnp error
+                                __text_error_description = message;
+                                break;
+                            case 2:
+                                // BadFormat
+                                __text_error_description = i18n.tr("The file is not in a valid key format");
+                                break;
+                            default:
+                                console.warn("Unhandled error code");
+                                __text_error_description = message;
+                                break;
+                            }
+                            PopupUtils.open(dialogImportKeyPageError);
+                        });
                     }
-                    importKeyFilePage.activeTransfer = null
-                }
-            })
+                });
+            };
         }
-
         onCancelPressed: {
-            pageStack.pop()
+            pageStack.pop();
         }
     }
 
     ContentTransferHint {
         id: transferHint
+
         anchors.fill: parent
         activeTransfer: importKeyFilePage.activeTransfer
     }
 
     Component {
         id: dialogImportKeyPageError
+
         ErrorDialog {
             textError: i18n.tr("Key import failed !")
+            textErrorDescription: __text_error_description
         }
+
     }
 
     Component {
         id: dialogImportKeyPageSucess
+
         SuccessDialog {
             textSuccess: i18n.tr("Key successfully imported !")
             onDialogClosed: {
-                pageStack.pop()
+                pageStack.pop();
             }
         }
+
     }
+
+    header: StackHeader {
+        id: importKeyHeader
+
+        title: i18n.tr("GPG Key Import")
+    }
+
 }

qml/pages/settings/ImportSSHkey.qml

@@ -0,0 +1,35 @@
+import "../../components"
+import Git 1.0
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Lomiri.Content 1.3
+import Utils 1.0
+
+ImportFile {
+    id: importSSHKeyPage
+
+    property bool isPrivateKey
+
+    headerTitle: i18n.tr("SSH Key Import")
+    dialogSuccessTxt: i18n.tr("SSH Key successfully imported !")
+    dialogErrorTxt: i18n.tr("SSH Key import failed !")
+    contentPicker.onPeerSelected: {
+        {
+            importSSHKeyPage.contentPicker.peer.selectionType = ContentTransfer.Single;
+            importSSHKeyPage.activeTransfer = importSSHKeyPage.contentPicker.peer.request();
+            importSSHKeyPage.activeTransfer.stateChanged.connect(function() {
+                if (importSSHKeyPage.activeTransfer.state === ContentTransfer.Charged) {
+                    console.log("Charged");
+                    console.log(importSSHKeyPage.activeTransfer.items[0].url);
+                    var ret = Git.importSshKey(importSSHKeyPage.activeTransfer.items[0].url, isPrivateKey);
+                    Utils.rmFile(importSSHKeyPage.activeTransfer.items[0].url);
+                    importSSHKeyPage.activeTransfer = null;
+                    if (ret)
+                        PopupUtils.open(importSSHKeyPage.dialogImportKeyPageSucess);
+                    else
+                        PopupUtils.open(importSSHKeyPage.dialogImportKeyPageError);
+                }
+            });
+        };
+    }
+}

qml/pages/settings/ImportZip.qml

@@ -1,99 +1,103 @@
-import QtQuick 2.4
-import Lomiri.Components 1.3
-import Lomiri.Content 1.3
-import Lomiri.Components.Popups 1.3
-import Pass 1.0
-import Utils 1.0
-import "../headers"
 import "../../dialogs"
+import "../headers"
+import Lomiri.Components 1.3
+import Lomiri.Components.Popups 1.3
+import Lomiri.Content 1.3
+import Pass 1.0
+import QtQuick 2.4
+import Utils 1.0
 
 Page {
     id: importZipPage
 
     property var activeTransfer
 
-    header: StackHeader {
-        id: importZipHeader
-        title: i18n.tr("Zip Password Store Import")
+    Component.onCompleted: {
+        PopupUtils.open(importZipPageImportValidation, importZipPage);
     }
 
     ContentPeerPicker {
         anchors.top: importZipHeader.bottom
         anchors.bottom: parent.bottom
         anchors.topMargin: importZipPage.header.height
-
         width: parent.width
-
         visible: parent.visible
         showTitle: false
         contentType: ContentType.Text
         handler: ContentHandler.Source
-
         onPeerSelected: {
-            peer.selectionType = ContentTransfer.Single
-            importZipPage.activeTransfer = peer.request()
-
-            importZipPage.activeTransfer.stateChanged.connect(function () {
+            peer.selectionType = ContentTransfer.Single;
+            importZipPage.activeTransfer = peer.request();
+            importZipPage.activeTransfer.stateChanged.connect(function() {
                 if (importZipPage.activeTransfer.state === ContentTransfer.Charged) {
-                    console.log("Charged")
-                    console.log(importZipPage.activeTransfer.items[0].url)
-
-                    var status = Utils.unzip(
-                                importZipPage.activeTransfer.items[0].url,
-                                Pass.getPasswordStore())
-
-                    Utils.rmFile(importZipPage.activeTransfer.items[0].url)
-
-                    if (status) {
-                        PopupUtils.open(dialogImportZipPageSuccess)
-                    } else {
-                        PopupUtils.open(dialogImportZipPageError)
-                    }
-                    importZipPage.activeTransfer = null
+                    console.log("Charged");
+                    console.log(importZipPage.activeTransfer.items[0].url);
+                    var status = Utils.unzip(importZipPage.activeTransfer.items[0].url, Pass.password_store);
+                    Utils.unzipSucceed.connect(function() {
+                        Utils.rmFile(importZipPage.activeTransfer.items[0].url);
+                        importZipPage.activeTransfer = null;
+                        PopupUtils.open(dialogImportZipPageSuccess);
+                    });
+                    Utils.unzipFailed.connect(function() {
+                        Utils.rmFile(importZipPage.activeTransfer.items[0].url);
+                        importZipPage.activeTransfer = null;
+                        PopupUtils.open(dialogImportZipPageError);
+                    });
                 }
-            })
+            });
         }
-
         onCancelPressed: {
-            pageStack.pop()
+            pageStack.pop();
         }
     }
 
     ContentTransferHint {
         id: transferHint
+
         anchors.fill: parent
         activeTransfer: importZipPage.activeTransfer
     }
 
     Component {
         id: importZipPageImportValidation
+
         SimpleValidationDialog {
-            text: i18n.tr(
-                      "Importing a new zip will delete<br>any existing password store!<br>Continue ?")
+            text: i18n.tr("Importing a new zip will delete<br>any existing password store!<br>Continue ?")
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
             onCanceled: {
-                pageStack.pop()
+                pageStack.pop();
             }
         }
+
     }
 
     Component {
         id: dialogImportZipPageError
+
         ErrorDialog {
             textError: i18n.tr("Password store import failed !")
         }
+
     }
 
     Component {
         id: dialogImportZipPageSuccess
+
         SuccessDialog {
             textSuccess: i18n.tr("Password store sucessfully imported !")
             onDialogClosed: {
-                pageStack.pop()
+                pageStack.clear();
+                pageStack.push(Qt.resolvedUrl("../PasswordList.qml"));
             }
         }
+
     }
 
-    Component.onCompleted: {
-        PopupUtils.open(importZipPageImportValidation, importZipPage)
+    header: StackHeader {
+        id: importZipHeader
+
+        title: i18n.tr("Zip Password Store Import")
     }
+
 }

qml/pages/settings/InfoKeys.qml

@@ -1,29 +1,68 @@
-import QtQuick 2.4
+import "../../components"
+import "../../dialogs"
+import "../headers"
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
 import Pass 1.0
-import "../headers"
-import "../../components"
-import "../../dialogs"
+import QtQuick 2.4
 
 Page {
     id: infoKeysPage
 
-    property string currentKey
+    property list<QtObject> __keys
+    property QtObject __currentKey
 
-    header: StackHeader {
-        id: infoKeysHeader
-        title: i18n.tr('Info Keys')
+    Component.onCompleted: {
+        Pass.getAllGPGKeysSucceed.connect(function(keys_info) {
+            infoKeysPage.__keys = keys_info.keys;
+        });
+        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();
     }
 
-    ListView {
-        id: infoKeysListView
+    Column {
         anchors.top: infoKeysHeader.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+        visible: infoKeysPage.__keys.length === 0
 
-        model: Pass.gpgGetAllKeysModel()
+        Rectangle {
+            width: parent.width
+            height: units.gu(1)
+            color: theme.palette.normal.background
+        }
+
+        Text {
+            text: i18n.tr("No key found")
+            width: parent.width
+            horizontalAlignment: Text.AlignHCenter
+            color: theme.palette.normal.backgroundText
+        }
+
+    }
+
+    ListView {
+        id: infoKeysListView
+
+        anchors.top: infoKeysHeader.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(2)
+        visible: infoKeysPage.__keys.length !== 0
+        model: infoKeysPage.__keys
 
         delegate: Grid {
             columns: 1
@@ -34,67 +73,147 @@ Page {
             Rectangle {
                 width: parent.width
                 height: units.gu(1)
+                color: theme.palette.normal.background
             }
 
             Text {
-                id: uidKey
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                text: i18n.tr('Key id : %1').arg(model.modelData.uid)
+                text: i18n.tr('Key ID :')
+                color: theme.palette.normal.backgroundText
+            }
+
+            Text {
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: {
+                    if (!model.modelData)
+                        "";
+                    else
+                        model.modelData.keyid;
+                }
+                color: theme.palette.normal.backgroundText
+            }
+
+            Rectangle {
+                width: parent.width
+                height: units.gu(1)
+                color: theme.palette.normal.background
+            }
+
+            ListModel {
+                id: userIdsModel
+
+                Component.onCompleted: {
+                    if (model.modelData) {
+                        for (var i = 0; i < model.modelData.userids.length; ++i) {
+                            userIdsModel.append({
+                                "model": model.modelData.userids[i]
+                            });
+                        }
+                    }
+                }
+            }
+
+            Text {
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: i18n.tr('User IDs : ')
+                color: theme.palette.normal.backgroundText
+            }
+
+            Repeater {
+                model: userIdsModel
+
+                Text {
+                    width: parent.width
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    text: modelData
+                    color: theme.palette.normal.backgroundText
+                }
+
+            }
+
+            Rectangle {
+                width: parent.width
+                height: units.gu(1)
+                color: theme.palette.normal.background
             }
 
             Button {
                 id: buttonDeleteKey
+
+                width: parent.width
                 text: i18n.tr("Delete this key")
-                color: LomiriColors.red
+                color: theme.palette.normal.negative
                 onClicked: {
-                    infoKeysPage.currentKey = model.modelData.uid
-                    PopupUtils.open(infoKeysPageDeleteValidation, infoKeysPage)
+                    infoKeysPage.__currentKey = model.modelData;
+                    PopupUtils.open(infoKeysPageDeleteValidation, infoKeysPage);
                 }
             }
 
             Rectangle {
                 width: parent.width
                 height: units.gu(1)
+                color: theme.palette.normal.background
             }
+
         }
+
     }
 
     Component {
         id: infoKeysPageDeleteValidation
-        DoubleValidationDialog {
-            text1: i18n.tr(
-                       "You're are about to delete<br>%1<br>Continue ?").arg(
-                       infoKeysPage.currentKey)
-            text2: i18n.tr(
-                       "%1<br>will be definitively removed.<br>Continue ?").arg(
-                       infoKeysPage.currentKey)
-            onDoubleValidated: {
-                var status = Pass.gpgDeleteKeyId(infoKeysPage.currentKey)
-                if (status) {
-                    PopupUtils.open(infoKeysPageDeleteSuccess)
-                } else {
-                    PopupUtils.open(infoKeysPageDeleteError)
-                }
+
+        SimpleValidationDialog {
+            text: i18n.tr("You're are about to delete<br>%1.<br>Continue ?").arg(infoKeysPage.__currentKey.keyid)
+            continueText: i18n.tr("Yes")
+            continueColor: theme.palette.normal.negative
+            onValidated: {
+                var status = Pass.deleteGPGKey(infoKeysPage.__currentKey);
             }
         }
+
     }
 
     Component {
         id: infoKeysPageDeleteError
+
         ErrorDialog {
             textError: i18n.tr("Key removal failed !")
         }
+
     }
 
     Component {
         id: infoKeysPageDeleteSuccess
+
         SuccessDialog {
             textSuccess: i18n.tr("Key successfully deleted !")
             onDialogClosed: {
-                infoKeysListView.model = Pass.gpgGetAllKeysModel()
+                Pass.getAllGPGKeys();
             }
         }
+
     }
+
+    Component {
+        id: infoKeysPageGetAllError
+
+        ErrorDialog {
+            textError: i18n.tr("An Error occured getting GPG keys !")
+        }
+
+    }
+
+    header: StackHeader {
+        id: infoKeysHeader
+
+        title: i18n.tr('Info Keys')
+    }
+
 }

qml/pages/settings/Settings.qml

@@ -1,19 +1,12 @@
-import QtQuick 2.4
+import "../../components"
+import "../headers"
 import Lomiri.Components 1.3
 import Pass 1.0
-import "../headers"
-import "../../components"
+import QtQuick 2.4
 
 Page {
     id: settingsPage
 
-    property string gpgKeyId: ""
-
-    header: StackHeader {
-        id: settingsHeader
-        title: i18n.tr('Settings')
-    }
-
     Flow {
         anchors.top: settingsHeader.bottom
         anchors.bottom: parent.bottom
@@ -26,34 +19,58 @@ Page {
             width: parent.width
             height: units.gu(4)
             text: i18n.tr('GPG')
+            color: theme.palette.normal.backgroundText
         }
+
         PageStackLink {
             page: Qt.resolvedUrl("ImportKeyFile.qml")
             text: i18n.tr('Import a GPG key file')
         }
+
         PageStackLink {
             page: Qt.resolvedUrl("InfoKeys.qml")
             text: i18n.tr('Show GPG keys')
         }
+
         Text {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             width: parent.width
             height: units.gu(4)
             text: i18n.tr('Password Store')
+            color: theme.palette.normal.backgroundText
         }
+
+        PageStackLink {
+            page: Qt.resolvedUrl("ImportGitClone.qml")
+            text: i18n.tr('Import a Password Store using Git')
+        }
+
         PageStackLink {
             page: Qt.resolvedUrl("ImportZip.qml")
             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
             width: parent.width
             height: units.gu(4)
-            color: LomiriColors.red
-            text: i18n.tr(
-                      'Warning: importing delete any exiting Password Store')
+            color: theme.palette.normal.negative
+            text: i18n.tr('Warning: importing delete any exiting Password Store')
         }
+
     }
+
+    header: StackHeader {
+        id: settingsHeader
+
+        title: i18n.tr('Settings')
+    }
+
 }

qml/settings/GitSettings.qml

@@ -0,0 +1,7 @@
+import Qt.labs.settings 1.0
+pragma Singleton
+
+Settings {
+    property int type: 0
+    property string repoUrl: null
+}

qml/settings/qmldir

@@ -0,0 +1,2 @@
+module settings
+singleton GitSettings 1.0 GitSettings.qml

qml/styles/CustomBorder.qml

@@ -4,18 +4,14 @@ import QtQuick 2.4
 
 Rectangle {
     property bool commonBorder: true
-
     property int lBorderwidth: 1
     property int rBorderwidth: 1
     property int tBorderwidth: 1
     property int bBorderwidth: 1
-
     property int commonBorderWidth: 1
-
-    z: -1
-
     property string borderColor: "white"
 
+    z: -1
     color: borderColor
 
     anchors {
@@ -23,10 +19,10 @@ Rectangle {
         right: parent.right
         top: parent.top
         bottom: parent.bottom
-
         topMargin: commonBorder ? -commonBorderWidth : -tBorderwidth
         bottomMargin: commonBorder ? -commonBorderWidth : -bBorderwidth
         leftMargin: commonBorder ? -commonBorderWidth : -lBorderwidth
         rightMargin: commonBorder ? -commonBorderWidth : -rBorderwidth
     }
+
 }

tests.in.cpp

@@ -0,0 +1,20 @@
+#include <QGuiApplication>
+#include <QCoreApplication>
+#include <QUrl>
+#include <QString>
+#include <QQuickView>
+#include <QtQml>
+
+
+#include <QtQuickTest/quicktest.h>
+
+
+int main(int argc, char *argv[])
+{
+    qDebug() << "Starting app from tests.cpp";
+    new QGuiApplication(argc, argv);
+
+    QGuiApplication::setApplicationName("utpass.qrouland");
+
+    return quick_test_main(argc, argv, "@TESTS_PATH@", "@TESTS_PATH@");
+}

tests/assets/gpg/clear_text.txt

@@ -0,0 +1 @@
+SomePassword

tests/assets/gpg/clear_text.txt.gpg

@@ -0,0 +1 @@
+<EFBFBD>^<03><><EFBFBD><EFBFBD><16>8m
@<40><>
z<>,fL<66>?Վ<><D58E>j<EFBFBD><1C><>'<12><>!<21>[Pfi0<69>p<EFBFBD><70>:<3A><02>0C<30>9e;<13><><EFBFBD>/<2F><><EFBFBD><04>c<EFBFBD>;Y<>\<5C><><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>
Gw<>H<EFBFBD><48>`
	<10>Pt.E8<45><38><EFBFBD>y<EFBFBD><79>[z[m<><6D><EFBFBD><EFBFBD><EFBFBD> <20><03>O<EFBFBD><4F><EFBFBD>XkL<6B><4C>c<EFBFBD><63><EFBFBD>뜁<1C>pC<70>+<2B><>$<24><>I<EFBFBD>I{<7B>H<EFBFBD>v<EFBFBD><76><EFBFBD>0<10>]<5D>r<EFBFBD><72>H<EFBFBD><1A><08>l/<2F>!l<><03><><EFBFBD><EFBFBD><EFBFBD>0

tests/assets/gpg/passphrase.txt

@@ -0,0 +1 @@
+utpasspassphrase

tests/assets/password-store/.gitattributes

@@ -0,0 +1 @@
+*.gpg diff=gpg

tests/assets/password-store/.gpg-id

@@ -0,0 +1 @@
+UTPass Test

tests/assets/password-store/test.gpg

@@ -0,0 +1 @@
+└^ШзАщн8m
@%f#▄≥┌б╧┌пмnW▐[qЬ╜┴Xз&ч>&MO`0жБ@
o▀▓(М≤R▒╖└+-В┌щ╧ 'ZHБ╗╖╤лEЗfКцJ╧Nxаь⌠8РтE
	⌠з│W/°<┐-И7л#oJ╛dЭ≥7^т?аыHЫ4²H9└`kОdеwg╨d©╓Р9╣лА·ё▒x╫│╧Ж

tests/plugins/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(TestsUtils)

tests/plugins/TestsUtils/CMakeLists.txt

@@ -0,0 +1,30 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN "TestsUtils")
+
+set(
+        SRC
+        plugin.cpp
+        utils.cpp
+)
+
+set(CMAKE_AUTOMOC ON)
+
+execute_process(
+        COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+        OUTPUT_VARIABLE ARCH_TRIPLET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+if(ARCH_TRIPLET STREQUAL "")
+    set(ARCH_TRIPLET x86_64-linux-gnu)
+endif()
+
+add_library(${PLUGIN} MODULE ${SRC})
+set_target_properties(${PLUGIN} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PLUGIN})
+qt5_use_modules(${PLUGIN} Qml Quick DBus)
+
+
+set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
+
+install(TARGETS ${PLUGIN} DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN}/)
+install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN}/)

tests/plugins/TestsUtils/passphraseprovider.h

@@ -0,0 +1,41 @@
+#ifndef UTPASSPHRASEPROVIDER_H
+#define UTPASSPHRASEPROVIDER_H
+
+#include <QObject>
+#include <gpg-error.h>
+// extern "C" {
+// #include <rnp/rnp.h>
+// }
+
+class TesTPassphraseProvider : public QObject
+{
+    Q_OBJECT
+private:
+    explicit TesTPassphraseProvider(QObject * parent = nullptr)
+    {}
+
+public:
+    ~TesTPassphraseProvider() = default;
+
+    static TesTPassphraseProvider &instance()
+    {
+        static TesTPassphraseProvider instance;
+        return instance;
+    }
+    TesTPassphraseProvider(TesTPassphraseProvider const &) = delete;
+    void operator=(TesTPassphraseProvider const &) = delete;
+
+
+    static bool
+    example_pass_provider(rnp_ffi_t        ffi,
+                          void            *app_ctx,
+                          rnp_key_handle_t key,
+                          const char      *pgp_context,
+                          char             buf[],
+                          size_t           buf_len)
+    {
+        strncpy(buf, "utpasspassphrase", buf_len);
+        return true;
+    }
+};
+#endif

tests/plugins/TestsUtils/plugin.cpp

@@ -0,0 +1,10 @@
+#include <QtQml>
+
+#include "plugin.h"
+#include "utils.h"
+
+void TestsUtilsPlugin::registerTypes(const char *uri)
+{
+    //@uri TestUtils
+    qmlRegisterSingletonType<TestsUtilsPlugin>(uri, 1, 0, "TestsUtils", [](QQmlEngine *, QJSEngine *) -> QObject * { return new TestsUtils; });
+}