Fix typo

Added Dutch translation

CMakeLists.txt

@@ -48,6 +48,10 @@ 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()

README.md

@@ -4,7 +4,7 @@ A Ubuntu Touch password management app aiming to be compatible with [ZX2C4’s p
 
 ## 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)
 
@@ -31,14 +31,14 @@ Export passwords to a ZIP archive, assuming they reside in the *.password-store*
 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)
 

plugins/Git/git.cpp

@@ -12,8 +12,15 @@ extern "C" {
 #include "jobs/gitjob.h"
 
 Git::Git():
-    m_sem(std::unique_ptr<QSemaphore>(new QSemaphore(1)))
+    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();
 }
 
@@ -26,16 +33,15 @@ Git::~Git()
 bool Git::clone(QString url, QString path, cred_type mode)
 {
     if (!this->m_sem->tryAcquire(1, 500)) {
-        qWarning() << "Can acquire git semaphore a command is already running ";
+        qWarning() << "[Git] Can acquire git semaphore a command is already running ";
         return false;
     }
     auto v =  overload {
-        [](const HTTP & x)        { return "HTTP"; },
+        [](const HTTP & x)        { UNUSED(x); return "HTTP"; },
-        [](const HTTPUserPass & x)    { return "HTTPAuth"; },
+        [](const HTTPUserPass & x)    { UNUSED(x); return "HTTPAuth"; },
-        [](const SSHPass & x)     { return "SSHAuth"; },
+        [](const SSHKey & x)      { UNUSED(x); return "SSHKey"; },
-        [](const SSHKey & x)      { return "SSHKey"; },
     };
-    qDebug() << "Creating clone Job  " << url << " " << path << " " << std::visit(v, mode);
+    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);
@@ -45,18 +51,26 @@ bool Git::clone(QString url, QString path, cred_type mode)
 
 bool Git::cloneHttp(QString url, QString path)
 {
-    qInfo() << "Call clone command Http " << url << " " << 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() << "Call clone command HttpPass " << url << " " << path;
+    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 bool err)
 {
 
@@ -67,3 +81,23 @@ void Git::cloneResult(const bool err)
     }
     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

@@ -2,6 +2,7 @@
 #define GIT_H
 
 #include "jobs/gitjob.h"
+#include "qdebug.h"
 #include <QUrl>
 #include <QObject>
 #include <QSemaphore>
@@ -16,6 +17,8 @@
 class Git : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString privKey READ pubKeyPath)
+    Q_PROPERTY(QString pubKey  READ privKeyPath)
 
 private slots:
     /**
@@ -47,12 +50,13 @@ signals:
 
 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 or SSH).
+     * 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.
@@ -61,30 +65,53 @@ private:
      */
     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, setting up necessary resources such as the semaphore for concurrent operation management.
+     * Initializes the `Git` class.
      */
     Git();
 
     /**
      * @brief Destructor for the Git class.
      *
-     * Cleans up any resources used by the `Git` class, ensuring that no ongoing operations or resources are left hanging.
+     * 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.
-     * It is a wrapper around the private `clone()` method, specifying the HTTP cloning mode.
      *
      * @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 successful, `false` otherwise.
+     * @return `true` if the clone operation was successfully started, `false` otherwise.
      */
     Q_INVOKABLE bool cloneHttp(QString url, QString path);
 
@@ -97,13 +124,22 @@ public:
      * @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 operation was successful, `false` otherwise.
+     * @return `true` if the clone job operation was successfully started, `false` otherwise.
      */
     Q_INVOKABLE bool cloneHttpPass(QString url, QString path, QString pass);
 
-    // Future SSH support methods:
+    /**
-    // Q_INVOKABLE bool clone_ssh_pass(QString url, QString path, QString pass);
+     * @brief Clones a repository over SSH with a key for authentication.
-    // Q_INVOKABLE bool clone_ssh_key(QString url, QString path, QString pub_key, QString priv_key, QString passphrase);
+     *
+     * 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);
     // ....

plugins/Git/jobs/clonejob.cpp

@@ -37,7 +37,7 @@ QDir CloneJob::cloneSetup()
     QDir tmp_dir(QStandardPaths::writableLocation( QStandardPaths::CacheLocation).append("/clone"));
 
     tmp_dir.removeRecursively();
-    qDebug() << "[CloneJob]Temp dir path is " << tmp_dir.absolutePath();
+    qDebug() << "[CloneJob] Temp dir path is " << tmp_dir.absolutePath();
 
     return tmp_dir;
 }
@@ -64,9 +64,10 @@ bool CloneJob::clone(QString url, QString path, cred_type cred, git_cred_acquire
 {
     git_repository *repo = NULL;
     git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
+    PayloadCB payload = PayloadCB(false, cred);
 
     opts.fetch_opts.callbacks.credentials = cb;
-    opts.fetch_opts.callbacks.payload = &cred;
+    opts.fetch_opts.callbacks.payload = &payload;
 
     int ret = git_clone(&repo, url.toLocal8Bit().data(), path.toLocal8Bit().data(), &opts);
     if (ret == GIT_EUSER ) {

plugins/Git/jobs/gitjob.cpp

@@ -18,36 +18,57 @@ 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)
 {
-    cred_type *cred = (cred_type *)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";
+        return (int) GIT_EUSER;
+    }
+
+    if (p->called) {
+        qWarning() << "[GitJob] credentials_cb : cb already called, probably invalid creds";
+        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 ";
+            qWarning() << "[GitJob] credentialsCB : callback should never be call for HTTP";
             return (int) GIT_EUSER;
         },
-        [&out, &username_from_url](const HTTPUserPass & x)
+        [allowed_types, &out, &username_from_url](const HTTPUserPass & x)
         {
             qDebug() << "[GitJob] credentialsCB : HTTPUserPass ";
-            if (!username_from_url) {
+            if (!(allowed_types & GIT_CREDTYPE_USERPASS_PLAINTEXT)) {
-                qWarning() << "[GitJob] credentials_cb : no username provided ";
+                qWarning() << "[GitJob] credentials_cb : allowed_types is invalid for HTTPUserPass creds";
                 return (int) GIT_EUSER;
             }
             return git_cred_userpass_plaintext_new(out, username_from_url, x.pass.toLocal8Bit().constData());
         },
-        [](const SSHPass & x)
+        [allowed_types, &out, &username_from_url](const SSHKey & x)
         {
-            qWarning() << "[GitJob] credentials_cb : SSHAuth to be implemented ";
+            qDebug() << "[GitJob] credentialsCB : SSHKey ";
-            return (int) GIT_EUSER;
+            if (!(allowed_types & GIT_CREDTYPE_SSH_KEY)) {
-        }, // TODO
+                qWarning() << "[GitJob] credentials_cb : allowed_types is invalid for SSHKey creds";
-        [](const SSHKey & x)
+                return (int) GIT_EUSER;
-        {
+            }
-            qWarning() << "[GitJob] credentials_cb : SSHKey to be implemented ";
+            qDebug() << "[GitJob] username_from_url :" << username_from_url;
-            return (int) GIT_EUSER;
+            qDebug() << "[GitJob] pub_key :" << x.pub_key.toLocal8Bit().constData();
-        }  // TODO
+            qDebug() << "[GitJob] priv_key :" << x.priv_key.toLocal8Bit().constData();
+            qDebug() << "[GitJob] passphrase :" << x.passphrase.toLocal8Bit().constData();
+            return git_cred_ssh_key_new(out, username_from_url, x.pub_key.toLocal8Bit().constData(),
+                                        x.priv_key.toLocal8Bit().constData(), x.passphrase.toLocal8Bit().constData());
+        }
     };
-    return std::visit(v, *cred);
+    auto ret = std::visit(v, p->creds);
+    return ret;
 }

plugins/Git/jobs/gitjob.h

@@ -1,6 +1,7 @@
 #ifndef GITJOB_H
 #define GITJOB_H
 
+#include <QDir>
 #include <QThread>
 extern "C" {
 #include <git2.h>
@@ -8,12 +9,17 @@ extern "C" {
 #include <variant>
 
 // Forward declarations for the different credential types.
-struct HTTP { };
+struct HTTP {};
 struct HTTPUserPass {
     QString pass; ///< Password for HTTP user authentication.
 };
-struct SSHPass { };
+struct SSHKey {
-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.
@@ -21,10 +27,17 @@ struct SSHKey { };
  * This type is used to store one of the following credential types:
  * - HTTP
  * - HTTPUserPass
- * - SSHPass
  * - SSHKey
  */
-typedef std::variant<HTTP, HTTPUserPass, SSHPass, SSHKey> cred_type;
+typedef std::variant<HTTP, HTTPUserPass, SSHKey> cred_type;
+
+
+struct PayloadCB
+{
+    bool called;
+    cred_type creds;
+    PayloadCB(bool ca, cred_type cr): called(ca), creds(cr) {}
+};
 
 /**
  * @class GitJob

plugins/Git/plugin.cpp

@@ -9,5 +9,4 @@ void GitPlugin::registerTypes(const char *uri)
 {
     //@uri Git
     qmlRegisterSingletonType<Git>(uri, 1, 0, "Git", [](QQmlEngine *, QJSEngine *) -> QObject * { return new Git; });
-
 }

plugins/Git/utils.h

@@ -1,6 +1,8 @@
 #ifndef UTILS_H
 #define UTILS_H
 
+#define UNUSED(x) (void)(x)
+
 /**
  * @brief A utility structure for enabling function overloading with template-based classes.
  * see : https://stackoverflow.com/a/64018031

plugins/Pass/CMakeLists.txt

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

plugins/Pass/error.h

@@ -0,0 +1,71 @@
+// error.h
+#ifndef ERROR_H
+#define ERROR_H
+
+extern "C" {
+#include "rnp/rnp_err.h"
+}
+
+enum class ErrorCodeShow {
+    Success= 0,
+    UnexceptedError,
+    BadPassphrase,
+    NoKeyFound,
+    DecryptFailed
+};
+
+int rnpErrorToErrorCodeShow(int rnpErrorCode) {
+    switch (rnpErrorCode) {
+    case RNP_SUCCESS:
+        return static_cast<int>(ErrorCodeShow::Success);
+    case RNP_ERROR_BAD_PASSWORD:
+        return static_cast<int>(ErrorCodeShow::BadPassphrase);
+    case RNP_ERROR_KEY_NOT_FOUND:
+    case RNP_ERROR_NO_SUITABLE_KEY:
+        return static_cast<int>(ErrorCodeShow::NoKeyFound);
+    case RNP_ERROR_DECRYPT_FAILED:
+        return static_cast<int>(ErrorCodeShow::DecryptFailed);
+    default:
+        return static_cast<int>(ErrorCodeShow::UnexceptedError);
+    }
+}
+
+enum class ErrorCodeImportKeyFile {
+    Success= 0,
+    UnexceptedError,
+    BadFormat,
+};
+
+int rnpErrorToErrorCodeImportKeyFile(int rnpErrorCode) {
+    switch (rnpErrorCode) {
+    case RNP_SUCCESS:
+        return static_cast<int>(ErrorCodeShow::Success);
+    case RNP_ERROR_BAD_FORMAT:
+        return static_cast<int>(ErrorCodeImportKeyFile::BadFormat);
+    default:
+        return static_cast<int>(ErrorCodeImportKeyFile::UnexceptedError);
+    }
+}
+
+
+enum class ErrorCodeUnexvepted {
+    Success= 0,
+    UnexceptedError,
+};
+
+int rnpErrorToErrorCodeGeneric(int rnpErrorCode) {
+    switch (rnpErrorCode) {
+    case RNP_SUCCESS:
+        return static_cast<int>(ErrorCodeShow::Success);
+    default:
+        return static_cast<int>(ErrorCodeImportKeyFile::UnexceptedError);
+    }
+}
+
+enum class ErrorCode
+{
+    Success= 0,
+    Error,
+};
+
+#endif // ERROR_H

plugins/Pass/jobs/importkeyjob.cpp

@@ -42,29 +42,6 @@ void ImportKeyJob::run()
 
     // Save resulting keyring
     this->saveFullKeyring();
-    // rnp_output_t output = NULL;
-    // qDebug() << "[ImportKeyJob] Writing pubring to " << this->pubringPath();
-    // ret = rnp_output_to_file(&output, this->pubringPath().toLocal8Bit().constData(), RNP_OUTPUT_FILE_OVERWRITE);
-    // if (ret == RNP_SUCCESS) {
-    //     qDebug() << "[ImportKeyJob] Saving key pubring ";
-    //     ret = rnp_save_keys(this->m_ffi, RNP_KEYSTORE_GPG, output, RNP_LOAD_SAVE_PUBLIC_KEYS);
-
-    // }
-    // if (ret == RNP_SUCCESS) {
-    //     ret = rnp_output_finish(output);
-    // }
-    // rnp_output_destroy(output);
-    // terminateOnError(ret);
-
-    // qDebug() << "[ImportKeyJob] Writing secring to " << this->secringPath();
-    // ret = rnp_output_to_file(&output, this->secringPath().toLocal8Bit().constData(), RNP_OUTPUT_FILE_OVERWRITE);
-    // if (ret == RNP_SUCCESS) {
-    //     qDebug() << "[ImportKeyJob] Saving key secring ";
-    //     ret = rnp_save_keys(this->m_ffi, RNP_KEYSTORE_GPG, output, RNP_LOAD_SAVE_SECRET_KEYS);
-    // }
-
-    // rnp_output_destroy(output);
-    // terminateOnError(ret);
 
     // Emit result
     emit resultSuccess();

plugins/Pass/pass.cpp

@@ -3,6 +3,7 @@
 #include <QtCore/QDir>
 #include <QDirIterator>
 #include <QtConcurrent/QtConcurrent>
+#include "error.h"
 #include "jobs/decryptjob.h"
 #include "jobs/deletekeyjob.h"
 #include "jobs/getkeysjob.h"
@@ -108,7 +109,7 @@ bool Pass::show(QUrl url)
 void Pass::slotShowError(rnp_result_t err)
 {
     qInfo() << "[Pass] Show Failed";
-    emit showFailed(rnp_result_to_string(err));
+    emit showFailed(rnpErrorToErrorCodeShow(err), rnp_result_to_string(err));
     this->m_sem->release(1);
 }
 
@@ -136,13 +137,13 @@ bool Pass::deletePasswordStore()
 }
 
 void Pass::slotDeletePasswordStoreResult(bool err)
-{
+{ 
-    this->initPasswordStore(); // reinit an empty password-store
     if (err) {
         qInfo() << "[Pass] Delete Password Store Failed";
-        emit deletePasswordStoreFailed("failed to delete password store");
+        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);
@@ -167,7 +168,7 @@ bool Pass::deleteGPGKey(PassKeyModel* key)
 void Pass::slotDeleteGPGKeyError(rnp_result_t err)
 {
     qInfo() << "[Pass] Delete GPG key Failed";
-    emit deleteGPGKeyFailed(rnp_result_to_string(err));
+    emit deleteGPGKeyFailed(rnpErrorToErrorCodeGeneric(err), rnp_result_to_string(err));
     this->m_sem->release(1);
 }
 
@@ -197,7 +198,7 @@ bool Pass::importGPGKey(QUrl url)
 void Pass::slotImportGPGKeyError(rnp_result_t err)
 {
     qInfo() << "[Pass] Import GPG Key Failed";
-    emit importGPGKeyFailed(rnp_result_to_string(err));
+    emit importGPGKeyFailed(rnpErrorToErrorCodeImportKeyFile(err), rnp_result_to_string(err));
     this->m_sem->release(1);
 }
 
@@ -228,7 +229,7 @@ void Pass::slotGetAllGPGKeysError(rnp_result_t err)
 {
     qInfo() << "[Pass] Get all GPG Keys Failed";
     this->m_keyring_model = nullptr;
-    emit getAllGPGKeysFailed(rnp_result_to_string(err));
+    emit getAllGPGKeysFailed(rnpErrorToErrorCodeGeneric(err), rnp_result_to_string(err));
     this->m_sem->release(1);
 }
 

plugins/Pass/pass.h

@@ -78,7 +78,7 @@ signals:
      * @brief Emitted when a GPG key deletion fails.
      * @param message The error message describing the failure.
      */
-    void deleteGPGKeyFailed(QString message);
+    void deleteGPGKeyFailed(int err, QString message);
 
     /**
      * @brief Emitted when a GPG key is successfully imported.
@@ -89,7 +89,7 @@ signals:
      * @brief Emitted when a GPG key import fails.
      * @param message The error message describing the failure.
      */
-    void importGPGKeyFailed(QString message);
+    void importGPGKeyFailed(int err, QString message);
 
     /**
      * @brief Emitted when all GPG keys are successfully retrieved.
@@ -101,7 +101,7 @@ signals:
      * @brief Emitted when retrieving GPG keys fails.
      * @param message The error message describing the failure.
      */
-    void getAllGPGKeysFailed(QString message);
+    void getAllGPGKeysFailed(int err, QString message);
 
     // Pass-related signals
     /**
@@ -125,7 +125,7 @@ signals:
      * @brief Emitted when showing a password fails.
      * @param message The error message describing the failure.
      */
-    void showFailed(QString message);
+    void showFailed(int err, QString message);
 
     /**
      * @brief Emitted hen showing a password cancelled.
@@ -142,7 +142,7 @@ signals:
      * @brief Emitted when deleting the password store fails.
      * @param message The error message describing the failure.
      */
-    void deletePasswordStoreFailed(QString message);
+    void deletePasswordStoreFailed(int err, QString message);
 
 private:
     QString m_password_store; /**< The path to the password store. */

plugins/Utils/utils.cpp

@@ -15,7 +15,7 @@ bool Utils::unzip(QUrl zip_url, QString dir_out_path)
     if (!this->m_sem->tryAcquire(1, 500)) {
         return false;
     }
-    qInfo() << "Unzip path " << zip_url << " to " << dir_out_path;
+    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);
@@ -26,13 +26,13 @@ bool Utils::unzip(QUrl zip_url, QString dir_out_path)
 void Utils::unzipResult(bool err)
 {
 
-    qDebug() << "Unzip Result";
+    qDebug() << "[Utils] Unzip Result";
     if (err) {
-        qInfo() << "Unzip Failed";
+        qInfo() << "[Utils] Unzip Failed";
         emit unzipFailed();
 
     } else {
-        qInfo() << "Unzip Succeed";
+        qInfo() << "[Utils] Unzip Succeed";
         emit unzipSucceed();
     }
     this->m_sem->release(1);
@@ -42,7 +42,7 @@ void Utils::unzipResult(bool err)
 QString Utils::manifestPath()
 {
     auto path = QDir(QDir::currentPath()).filePath("manifest_.json");
-    qInfo() << "Manifest path : " << path;
+    qInfo() << "[Utils] Manifest path : " << path;
     return path;
 }
 
@@ -56,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

@@ -80,6 +80,14 @@ public:
      */
     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-02-04 17:49+0100\n"
+"POT-Creation-Date: 2025-03-14 10:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,69 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../qml/dialogs/ErrorDialog.qml:12
+#: ../qml/components/GitCloneHttp.qml:22
+#: ../qml/components/GitCloneHttpAuth.qml:22
+#: ../qml/components/GitCloneSshKey.qml:41
+msgid "Repo Url"
+msgstr ""
+
+#: ../qml/components/GitCloneHttp.qml:47
+#: ../qml/components/GitCloneHttpAuth.qml:67
+#: ../qml/components/GitCloneSshKey.qml:143
+msgid "Clone"
+msgstr ""
+
+#: ../qml/components/GitCloneHttpAuth.qml:42
+#: ../qml/components/GitCloneHttpAuth.qml:53
+msgid "Password"
+msgstr ""
+
+#: ../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:16
+#: ../qml/dialogs/ErrorDialog.qml:17
 msgid "Close"
 msgstr ""
 
@@ -75,82 +133,126 @@ msgstr ""
 msgid "Released under the terms of the GNU GPL v3"
 msgstr ""
 
-#: ../qml/pages/Info.qml:132 ../qml/pages/headers/MainHeader.qml:33
+#: ../qml/pages/Info.qml:132 ../qml/pages/headers/MainHeader.qml:38
 msgid "Info"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:45
+#: ../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:58
+#: ../qml/pages/PasswordList.qml:111
 msgid "You can import a password store by cloning or"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:65
+#: ../qml/pages/PasswordList.qml:118
 msgid "importing a password store zip in the settings"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:100
+#: ../qml/pages/PasswordList.qml:195
 msgid "Decryption failed !"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:114
+#: ../qml/pages/PasswordList.qml:219
 msgid "Back"
 msgstr ""
 
-#: ../qml/pages/PasswordList.qml:121 ../qml/pages/headers/MainHeader.qml:9
+#: ../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:26 ../qml/pages/settings/Settings.qml:75
+#: ../qml/pages/headers/MainHeader.qml:20
-msgid "Settings"
+#: ../qml/pages/headers/MainHeader.qml:62
-msgstr ""
-
-#: ../qml/pages/headers/MainHeader.qml:57
 msgid "Search"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:42
+#: ../qml/pages/headers/MainHeader.qml:31 ../qml/pages/settings/Settings.qml:73
-#: ../qml/pages/settings/Settings.qml:58
+msgid "Settings"
+msgstr ""
+
+#: ../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:55
+#: ../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:56
+#: ../qml/pages/settings/DeleteRepo.qml:57
+#: ../qml/pages/settings/ImportGitClone.qml:142
 #: ../qml/pages/settings/ImportZip.qml:66
 #: ../qml/pages/settings/InfoKeys.qml:174
-#: ../qml/pages/settings/git/ImportGitClone.qml:56
 msgid "Yes"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:69
+#: ../qml/pages/settings/DeleteRepo.qml:70
 msgid "Password Store removal failed !"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:78
+#: ../qml/pages/settings/DeleteRepo.qml:79
 msgid "Password Store deleted !"
 msgstr ""
 
-#: ../qml/pages/settings/DeleteRepo.qml:90
+#: ../qml/pages/settings/ImportGitClone.qml:141
-#: ../qml/pages/settings/InfoKeys.qml:216
+msgid ""
-msgid "Info Keys"
+"Importing a git repo will delete<br>any existing password store!"
+"<br>Continue ?"
 msgstr ""
 
-#: ../qml/pages/settings/ImportKeyFile.qml:61
+#: ../qml/pages/settings/ImportGitClone.qml:155
-msgid "Key import failed !"
+msgid "An error occured during git clone !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportKeyFile.qml:70
+#: ../qml/pages/settings/ImportGitClone.qml:164
+#: ../qml/pages/settings/ImportZip.qml:88
+msgid "Password store sucessfully imported !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportGitClone.qml:176
+msgid "Git Clone Import"
+msgstr ""
+
+#: ../qml/pages/settings/ImportKeyFile.qml:7
+msgid "GPG Key Import"
+msgstr ""
+
+#: ../qml/pages/settings/ImportKeyFile.qml:8
 msgid "Key successfully imported !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportKeyFile.qml:81
+#: ../qml/pages/settings/ImportKeyFile.qml:9
-msgid "GPG Key Import"
+msgid "Key import failed !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportKeyFile.qml:33
+msgid "The file is not in a valid key format"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:10
+msgid "SSH Key Import"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:11
+msgid "SSH Key successfully imported !"
+msgstr ""
+
+#: ../qml/pages/settings/ImportSSHkey.qml:12
+msgid "SSH Key import failed !"
 msgstr ""
 
 #: ../qml/pages/settings/ImportZip.qml:65
@@ -162,11 +264,6 @@ msgstr ""
 msgid "Password store import failed !"
 msgstr ""
 
-#: ../qml/pages/settings/ImportZip.qml:88
-#: ../qml/pages/settings/git/ImportGitClone.qml:78
-msgid "Password store sucessfully imported !"
-msgstr ""
-
 #: ../qml/pages/settings/ImportZip.qml:100
 msgid "Zip Password Store Import"
 msgstr ""
@@ -203,59 +300,34 @@ msgstr ""
 msgid "An Error occured getting GPG keys !"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:23
+#: ../qml/pages/settings/InfoKeys.qml:216
+msgid "Info Keys"
+msgstr ""
+
+#: ../qml/pages/settings/Settings.qml:21
 msgid "GPG"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:29
+#: ../qml/pages/settings/Settings.qml:27
 msgid "Import a GPG key file"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:34
+#: ../qml/pages/settings/Settings.qml:32
 msgid "Show GPG keys"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:42
+#: ../qml/pages/settings/Settings.qml:40
 msgid "Password Store"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:48
+#: ../qml/pages/settings/Settings.qml:46
 msgid "Import a Password Store using Git"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:53
+#: ../qml/pages/settings/Settings.qml:51
 msgid "Import a Password Store Zip"
 msgstr ""
 
-#: ../qml/pages/settings/Settings.qml:67
+#: ../qml/pages/settings/Settings.qml:65
 msgid "Warning: importing delete any exiting Password Store"
 msgstr ""
-
-#: ../qml/pages/settings/git/GitCloneHttp.qml:16
-#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:16
-msgid "Repo Url"
-msgstr ""
-
-#: ../qml/pages/settings/git/GitCloneHttp.qml:40
-#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:60
-msgid "Clone"
-msgstr ""
-
-#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:35
-#: ../qml/pages/settings/git/GitCloneHttpAuth.qml:46
-msgid "Password"
-msgstr ""
-
-#: ../qml/pages/settings/git/ImportGitClone.qml:55
-msgid ""
-"Importing a git repo will delete<br>any existing password store!"
-"<br>Continue ?"
-msgstr ""
-
-#: ../qml/pages/settings/git/ImportGitClone.qml:69
-msgid "An error occured during git clone !"
-msgstr ""
-
-#: ../qml/pages/settings/git/ImportGitClone.qml:90
-msgid "Git Clone Import"
-msgstr ""

qml/components/GitCloneHttp.qml

@@ -4,6 +4,12 @@ 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)
 
@@ -24,6 +30,7 @@ Column {
         verticalAlignment: Text.AlignVCenter
         width: parent.width
         placeholderText: "http(s)://<hostname>"
+        onTextChanged: repoUrlChanged(repoUrlInput.text)
     }
 
     Rectangle {

qml/components/GitCloneHttpAuth.qml

@@ -4,6 +4,12 @@ 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)
 
@@ -24,6 +30,7 @@ Column {
         verticalAlignment: Text.AlignVCenter
         width: parent.width
         placeholderText: "http(s)://<username>@<hostname>"
+        onTextChanged: repoUrlChanged(repoUrlInput.text)
     }
 
     Text {

qml/components/GitCloneSshKey.qml

@@ -0,0 +1,149 @@
+import Git 1.0
+import Lomiri.Components 1.3
+import Pass 1.0
+import Utils 1.0
+import QtQuick 2.4
+
+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,73 @@
+import "../dialogs"
+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 alias dialogImportKeyPageError : dialogImportKeyPageError
+    property alias dialogImportKeyPageSucess : dialogImportKeyPageSucess
+
+    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
+    }
+
+    Component {
+        id: dialogImportKeyPageError
+
+        ErrorDialog {
+            textError: importKeyFilePage.dialogErrorTxt
+            textErrorDescription: importKeyFilePage.dialogErrorDescriptionTxt
+        }
+
+    }
+
+    Component {
+        id: dialogImportKeyPageSucess
+
+        SuccessDialog {
+            textSuccess: importKeyFilePage.dialogSuccessTxt
+            onDialogClosed: {
+                pageStack.pop();
+            }
+        }
+
+    }
+
+    header: StackHeader {
+        id: importKeyHeader
+
+        title: importKeyFilePage.headerTitle
+    }
+
+}

qml/dialogs/ErrorDialog.qml

@@ -6,11 +6,12 @@ Dialog {
     id: dialog
 
     property string textError
+    property string textErrorDescription : null
 
     signal dialogClosed()
 
     title: i18n.tr("Error !")
-    text: textError
+    text: textErrorDescription ? (textError + "<br>" + textErrorDescription) :  textError
 
     Button {
         text: i18n.tr("Close")

qml/pages/PasswordList.qml

@@ -12,6 +12,7 @@ Page {
 
     property string __passwordStorePath
     property var __passwords
+    property string __text_error_description: null
 
     function __searchPasswords(filter) {
         var ret = [];
@@ -25,32 +26,53 @@ Page {
         return ret;
     }
 
-    function __searchUpdateModel(text) {
+    function __searchUpdateModel() {
-        var ret = __searchPasswords(text);
+        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]
+                "fileName": ret[i]
-                });
+            });
 
         }
     }
 
     anchors.fill: parent
     Component.onCompleted: {
-        __passwordStorePath = "file:" + Pass.password_store;
+        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(message) {
+        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) {
-            __passwords = passwords;
+            passwordListPage.__passwords = passwords;
+            __searchUpdateModel();
         });
         Pass.ls();
     }
@@ -109,12 +131,12 @@ Page {
         anchors.right: parent.right
         anchors.left: parent.left
         spacing: 1
-        visible: passwordListNav.model.count !== 0 && passwordListHeader.searchBarIsActive
+        visible: passwordListNav.model.count !== 0 && !passwordListHeader.searchBar.visible
 
         model: FolderListModel {
             nameFilters: ["*.gpg"]
-            rootFolder: __passwordStorePath
+            rootFolder: passwordListPage.__passwordStorePath
-            folder: __passwordStorePath
+            folder: passwordListPage.__passwordStorePath
             showDirs: true
         }
 
@@ -146,7 +168,7 @@ Page {
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
-        visible: passwordListNav.model.count !== 0 && !passwordListHeader.searchBarIsActive
+        visible: passwordListNav.model.count !== 0 && passwordListHeader.searchBar.visible
 
         model: ListModel {
         }
@@ -156,7 +178,7 @@ Page {
                 fName: fileName
                 fIsDir: false
                 onClicked: {
-                    var path = __passwordStorePath + "/" + fileName;
+                    var path = passwordListPage.__passwordStorePath + "/" + fileName;
                     console.debug("pass show %1".arg(path));
                     Pass.show(path);
                 }
@@ -171,15 +193,23 @@ Page {
 
         ErrorDialog {
             textError: i18n.tr("Decryption failed !")
+            textErrorDescription: __text_error_description
         }
+    }
 
+
+
+    Timer {
+        id: searchTimer
+
+        interval: 500
+        onTriggered: __searchUpdateModel()
     }
 
     header: MainHeader {
         id: passwordListHeader
 
-        onSearchBarActived: __searchUpdateModel("")
+        searchBar.onTextChanged: searchTimer.restart()
-        onSearchBarTextChanged: __searchUpdateModel(text)
         leadingActionBar.height: units.gu(4)
         leadingActionBar.actions: [
             Action {

qml/pages/headers/MainHeader.qml

@@ -2,12 +2,12 @@ import Lomiri.Components 1.3
 import QtQuick 2.4
 
 PageHeader {
+    //property alias searchBarText: searchBar.text
+    //signal searchBarTextChanged(string text)
+
     id: mainHeader
 
-    readonly property bool searchBarIsActive: !searchBar.visible
+    property alias searchBar: searchBar
-
-    signal searchBarActived()
-    signal searchBarTextChanged(string text)
 
     width: parent.width
     height: units.gu(6)
@@ -16,15 +16,14 @@ PageHeader {
     trailingActionBar.numberOfSlots: 2
     trailingActionBar.actions: [
         Action {
-            iconName: searchBarIsActive ? "search" : "close"
+            iconName: !searchBar.visible ? "search" : "close"
             text: i18n.tr("Search")
             onTriggered: {
                 searchBar.visible = !searchBar.visible;
                 labelTitle.visible = !searchBar.visible;
-                if (searchBar.visible === true) {
+                if (searchBar.visible === true)
                     searchBar.focus = true;
-                    searchBarActived();
+
-                }
             }
         },
         Action {
@@ -64,7 +63,6 @@ PageHeader {
             height: units.gu(4)
             visible: false
             anchors.verticalCenter: parent.verticalCenter
-            onContentWidthChanged: searchBarTextChanged(searchBar.text)
         }
 
     }

qml/pages/settings/DeleteRepo.qml

@@ -1,5 +1,6 @@
 import "../../components"
 import "../../dialogs"
+import "../../settings"
 import "../headers"
 import Lomiri.Components 1.3
 import Lomiri.Components.Popups 1.3
@@ -77,6 +78,8 @@ Page {
         SuccessDialog {
             textSuccess: i18n.tr("Password Store deleted !")
             onDialogClosed: {
+                GitSettings.type = 0;
+                GitSettings.repoUrl = null;
                 pageStack.clear();
                 pageStack.push(Qt.resolvedUrl("../PasswordList.qml"));
             }
@@ -87,7 +90,7 @@ Page {
     header: StackHeader {
         id: deleteRepoPageHeader
 
-        title: i18n.tr('Info Keys')
+        title: i18n.tr('Delete Password Store')
     }
 
 }

qml/pages/settings/ImportGitClone.qml

@@ -0,0 +1,179 @@
+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 {
+    id: importGitClonePage
+
+    property int __gitModeHTTP : 0
+    property int __gitModeHTTP_AUTH : 1
+    property int __gitModeSSH_KEY : 2
+
+
+    property string __repoUrl
+
+    function __loadForm() {
+        switch (combo.selectedIndex) {
+            case __gitModeHTTP:
+                importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttp.qml");
+                break;
+            case __gitModeHTTP_AUTH:
+                importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttpAuth.qml");
+                break;
+            case __gitModeSSH_KEY:
+                importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneSshKey.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);
+        });
+        Git.cloneFailed.connect(function() {
+            PopupUtils.open(dialogGitCloneError);
+        });
+        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: {
+                importGitCloneForm.item.repoUrlChanged.connect(function(url) {
+                    importGitClonePage.__repoUrl = url;
+                });
+                importGitCloneForm.item.setRepoUrl(importGitClonePage.__repoUrl);
+
+                switch (combo.selectedIndex) {
+                    case __gitModeHTTP:
+                        break;
+                    case __gitModeHTTP_AUTH:
+                        break;
+                    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;
+                    }
+            }
+        }
+
+    }
+
+    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 !")
+        }
+
+    }
+
+    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,84 +1,46 @@
-import "../../dialogs"
+import "../../components"
-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 {
+ImportFile {
     id: importKeyFilePage
 
-    property var activeTransfer
+    headerTitle: i18n.tr("GPG Key Import")
+    dialogSuccessTxt : i18n.tr("Key successfully imported !")
+    dialogErrorTxt : i18n.tr("Key import failed !")
 
-    ContentPeerPicker {
+    contentPicker.onPeerSelected: {
-        anchors.top: importKeyHeader.bottom
+       {
-        anchors.bottom: parent.bottom
+           peer.selectionType = ContentTransfer.Single;
-        anchors.topMargin: importKeyFilePage.header.height
+           importKeyFilePage.activeTransfer = peer.request();
-        width: parent.width
+           importKeyFilePage.activeTransfer.stateChanged.connect(function() {
-        visible: parent.visible
+               if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
-        showTitle: false
+                   console.log("Charged");
-        contentType: ContentType.Text
+                   console.log(importKeyFilePage.activeTransfer.items[0].url);
-        handler: ContentHandler.Source
+                   Pass.importGPGKey(importKeyFilePage.activeTransfer.items[0].url);
-        onPeerSelected: {
+                   Pass.importGPGKeySucceed.connect(function() {
-            peer.selectionType = ContentTransfer.Single;
+                       Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
-            importKeyFilePage.activeTransfer = peer.request();
+                       importKeyFilePage.activeTransfer = null;
-            importKeyFilePage.activeTransfer.stateChanged.connect(function() {
+                       PopupUtils.open(importKeyFilePage.dialogImportKeyPageSucess);
-                if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
+                   });
-                    console.log("Charged");
+                   Pass.importGPGKeyFailed.connect(function(err, message) {
-                    console.log(importKeyFilePage.activeTransfer.items[0].url);
+                       Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
-                    var status = Pass.importGPGKey(importKeyFilePage.activeTransfer.items[0].url);
+                       importKeyFilePage.activeTransfer = null;
-                    Pass.importGPGKeySucceed.connect(function() {
+                       switch (code) {
-                        Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
+                           case 1: // UnexceptedError -> use the default (not translate) rnp error
-                        importKeyFilePage.activeTransfer = null;
+                               __text_error_description = message;
-                        PopupUtils.open(dialogImportKeyPageSucess);
+                               break;
-                    });
+                           case 2: // BadFormat
-                    Pass.importGPGKeyFailed.connect(function(message) {
+                                __text_error_description = i18n.tr("The file is not in a valid key format");
-                        Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
+                               break;
-                        importKeyFilePage.activeTransfer = null;
+                           default:
-                        PopupUtils.open(dialogImportKeyPageError);
+                               console.warn("Unhandled error code");
-                    });
+                               __text_error_description = message;
-                }
+                               break;
-            });
+                       }
-        }
+                       PopupUtils.open(importKeyFilePage.dialogImportKeyPageError);
-        onCancelPressed: {
+                   });
-            pageStack.pop();
+               }
-        }
+           });
+       }
     }
-
-    ContentTransferHint {
-        id: transferHint
-
-        anchors.fill: parent
-        activeTransfer: importKeyFilePage.activeTransfer
-    }
-
-    Component {
-        id: dialogImportKeyPageError
-
-        ErrorDialog {
-            textError: i18n.tr("Key import failed !")
-        }
-
-    }
-
-    Component {
-        id: dialogImportKeyPageSucess
-
-        SuccessDialog {
-            textSuccess: i18n.tr("Key successfully imported !")
-            onDialogClosed: {
-                pageStack.pop();
-            }
-        }
-
-    }
-
-    header: StackHeader {
-        id: importKeyHeader
-
-        title: i18n.tr("GPG Key Import")
-    }
-
 }

qml/pages/settings/ImportSSHkey.qml

@@ -0,0 +1,34 @@
+import "../../components"
+import Utils 1.0
+import Git 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: {
+       {
+           peer.selectionType = ContentTransfer.Single;
+           importSSHKeyPage.activeTransfer = 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/Settings.qml

@@ -7,8 +7,6 @@ import QtQuick 2.4
 Page {
     id: settingsPage
 
-    property string gpgKeyId: ""
-
     Flow {
         anchors.top: settingsHeader.bottom
         anchors.bottom: parent.bottom
@@ -44,7 +42,7 @@ Page {
         }
 
         PageStackLink {
-            page: Qt.resolvedUrl("git/ImportGitClone.qml")
+            page: Qt.resolvedUrl("ImportGitClone.qml")
             text: i18n.tr('Import a Password Store using Git')
         }
 

qml/pages/settings/git/GitModeOptionSelector.qml

@@ -1,38 +0,0 @@
-import Git 1.0
-import Lomiri.Components 1.3
-import Lomiri.Components.Pickers 1.3
-import QtQuick 2.4
-
-OptionSelector {
-    id: combo
-
-    width: parent.width
-    model: ["HTTP", "HTTP AUTH"]
-    onDelegateClicked: function(i) {
-        if (i === 0)
-            timer.setTimeout(function() {
-            importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml");
-        }, 500);
-        else if (i === 1)
-            timer.setTimeout(function() {
-            importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttpAuth.qml");
-        }, 500);
-    }
-
-    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();
-        }
-
-    }
-
-}

qml/pages/settings/git/ImportGitClone.qml

@@ -1,93 +0,0 @@
-import "../../../components"
-import "../../../dialogs"
-import "../../headers"
-import Git 1.0
-import Lomiri.Components 1.3
-import Lomiri.Components.Popups 1.3
-import Pass 1.0
-import QtQuick 2.4
-
-Page {
-    id: importGitClonePage
-
-    Component.onCompleted: {
-        Git.cloneSucceed.connect(function() {
-            PopupUtils.open(dialogGitCloneSuccess);
-        });
-        Git.cloneFailed.connect(function() {
-            PopupUtils.open(dialogGitCloneError);
-        });
-        PopupUtils.open(importGitCloneValidation, importGitClonePage);
-        importGitCloneForm.source = Qt.resolvedUrl("GitCloneHttp.qml");
-    }
-
-    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
-        }
-
-        GitModeOptionSelector {
-            id: combo
-        }
-
-        Loader {
-            id: importGitCloneForm
-
-            width: parent.width
-        }
-
-    }
-
-    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 !")
-        }
-
-    }
-
-    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/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