Encryption Manager working

encryptionmanager.cpp

@@ -64,7 +64,9 @@ encryptionManager::encryptionManager(QWidget *parent) :
 
     setDefaultWorkDir();
     if(checkconfig(".config/18-encrypted_storage/initial_setup_done") == true) {
-        setupPassphraseDialog(1);
+        ui->activityWidget->hide();
+        setupPassphraseDialogMode = 1;
+        QTimer::singleShot(1000, this, SLOT(setupPassphraseDialog()));
     }
 }
 
@@ -75,12 +77,13 @@ encryptionManager::~encryptionManager()
 
 void encryptionManager::on_setupContinueBtn_clicked()
 {
-    setupPassphraseDialog(0);
+    setupPassphraseDialogMode = 0;
+    setupPassphraseDialog();
 }
 
-void encryptionManager::setupPassphraseDialog(int mode) {
+void encryptionManager::setupPassphraseDialog() {
     /*
-     * Mode can be:
+     * setupPassphraseDialogMode can be:
      * 0: Initial setup
      * 1: Normal behavior
     */
@@ -92,7 +95,7 @@ void encryptionManager::setupPassphraseDialog(int mode) {
     generalDialogWindow = new generalDialog();
     generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
     connect(generalDialogWindow, SIGNAL(refreshScreen()), SLOT(refreshScreen()));
-    if(mode == 0) {
+    if(setupPassphraseDialogMode == 0) {
         connect(generalDialogWindow, SIGNAL(destroyed(QObject*)), SLOT(setupEncryptedStorage()));
     }
     else {
@@ -121,7 +124,6 @@ void encryptionManager::refreshScreen() {
 }
 
 void encryptionManager::showToast(QString messageToDisplay) {
-    qDebug() << "showToast";
     global::toast::message = messageToDisplay;
     toastWindow = new toast(this);
     toastWindow->setAttribute(Qt::WA_DeleteOnClose);
@@ -139,6 +141,8 @@ void encryptionManager::setupEncryptedStorage() {
     string_writeconfig("/external_root/run/encfs/encrypted_storage_bootstrap_files_location", "/data/onboard/encfs-dropbox");
     string_writeconfig("/external_root/run/encfs/encrypted_storage_bootstrap_archive_location", "/data/onboard/data.encfs");
     string_writeconfig("/external_root/run/encfs/encrypted_storage_bootstrap_passphrase", bootstrapPassphrase);
+    setDefaultWorkDir();
+    string_writeconfig(".config/18-encrypted_storage/storage_list", "/data/onboard/encfs-decrypted");
     string_writeconfig("/opt/ibxd", "encfs_restart\n");
     bool exitStatus;
     ui->activityWidget->setCurrentIndex(3);
@@ -161,8 +165,10 @@ void encryptionManager::unlockEncryptedStorage() {
     std::string passphrase = global::encfs::passphrase.toStdString();
     global::encfs::passphrase = "";
     string_writeconfig("/external_root/run/encfs/encrypted_storage_archive", "/data/onboard/data.encfs");
-    string_writeconfig("/external_root/run/encfs/encrypted_storage_mountpoint", "/data/onboard/books");
+    string_writeconfig("/external_root/run/encfs/encrypted_storage_mountpoint", "/data/onboard/encfs-decrypted");
+    string_writeconfig("/external_root/run/encfs/encrypted_storage_bindmount", "/kobo/mnt/onboard/onboard/encfs-decrypted");
     string_writeconfig("/external_root/run/encfs/encrypted_storage_passphrase", passphrase);
+    string_writeconfig("/opt/ibxd", "encfs_restart\n");
     bool exitStatus;
     ui->activityWidget->setCurrentIndex(3);
     QTimer * t = new QTimer(this);
@@ -185,6 +191,7 @@ void encryptionManager::mkEncfsDirs() {
     dumpDir.mkpath(dumpPath);
     QDir decDir;
     QString decPath("/mnt/onboard/onboard/encfs-decrypted");
+    decDir.mkpath(decPath);
 }
 
 void encryptionManager::on_exitSuccessBtn_clicked()

encryptionmanager.h

@@ -18,6 +18,7 @@ public:
     explicit encryptionManager(QWidget *parent = nullptr);
     ~encryptionManager();
     bool setupExitWidgetRan = false;
+    int setupPassphraseDialogMode;
 
 private slots:
     void on_setupContinueBtn_clicked();
@@ -30,7 +31,7 @@ private slots:
     void on_exitSuccessBtn_clicked();
     void setupExitWidget(bool exitStatus);
     void on_failureContinueBtn_clicked();
-    void setupPassphraseDialog(int mode);
+    void setupPassphraseDialog();
     void unlockEncryptedStorage();
 
 private:

encryptionmanager.ui

@@ -75,7 +75,7 @@
          <item row="5" column="0">
           <widget class="QLabel" name="descriptionLabel">
            <property name="text">
-            <string>Encrypted storage permits you to keep your most important files and data safe from anyone else than you.
+            <string>Encrypted storage allows you to keep your most important files and data safe from anyone else than you.
 Would you like to enable it?</string>
            </property>
            <property name="alignment">

hourglassanimationwidget.cpp

@@ -32,7 +32,7 @@ hourglassAnimationWidget::hourglassAnimationWidget(QWidget *parent) :
         ui->hourglassBottomLabel->setPixmap(scaledPixmap);
     }
 
-    int i = 0;
+    i = 0;
     QTimer * t = new QTimer();
     t->setInterval(500);
     connect(t, &QTimer::timeout, [&]() {

hourglassanimationwidget.h

@@ -14,6 +14,7 @@ class hourglassAnimationWidget : public QWidget
 public:
     explicit hourglassAnimationWidget(QWidget *parent = nullptr);
     ~hourglassAnimationWidget();
+    int i;
 
 private:
     Ui::hourglassAnimationWidget *ui;

main.cpp

@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     if(checkconfig_str_val.isEmpty() == true) {
         string_writeconfig(".config/18-encrypted_storage/status", "true");
     }
-    if(checkconfig(".config/18-encrypted_storage/status") == true and checkconfig("/run/encfs_mounted") == false) {
+    if(checkconfig(".config/18-encrypted_storage/status") == true and checkconfig("/external_root/run/encfs_mounted") == false) {
         // Open Encryption Manager to unlock encrypted storage
         QApplication a(argc, argv);
         encryptionManager w;