filedialog for qml moved to main.qml

client/ui/controllers/importController.cpp

@@ -2,6 +2,7 @@
 
 #include <QFile>
 #include <QFileInfo>
+#include <QQuickItem>
 #include <QStandardPaths>
 
 #include "core/errorstrings.h"
@@ -87,7 +88,11 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 void ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QFile file(FileUtilites::getFileName(fileName));
+    QQuickItem *obj = findChild<QQuickItem *>("saveFileDialog");
+
+    QUrl url(fileName);
+    QString path = url.toLocalFile();
+    QFile file(path);
 
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();

client/ui/controllers/pageController.h

@@ -103,6 +103,10 @@ signals:
     void showPassphraseRequestDrawer();
     void passphraseRequestDrawerClosed(QString passphrase);
 
+    void setupFileDialogForConfig();
+    void setupFileDialogForSites(bool replaceExistingSites);
+    void setupFileDialogForBackup();
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
 

client/ui/controllers/systemController.cpp

@@ -0,0 +1,103 @@
+#include "systemController.h"
+
+#include <QDesktopServices>
+#include <QDir>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QQuickItem>
+#include <QStandardPaths>
+#include <QUrl>
+
+#ifdef Q_OS_ANDROID
+    #include "platforms/android/android_controller.h"
+#endif
+
+#ifdef Q_OS_IOS
+    #include "platforms/ios/MobileUtils.h"
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
+SystemController::SystemController(const std::shared_ptr<Settings> &settings, QObject *parent)
+    : QObject(parent), m_settings(settings)
+{
+}
+
+void SystemController::saveFile(QString fileName, const QString &data)
+{
+#if defined Q_OS_ANDROID
+    AndroidController::instance()->shareConfig(data, fileName);
+    return;
+#endif
+
+#ifdef Q_OS_IOS
+    QUrl fileUrl = QDir::tempPath() + "/" + fileName;
+    QFile file(fileUrl.toString());
+#else
+    QUrl fileUrl = QUrl(fileName);
+    QFile file(fileUrl.toLocalFile());
+#endif
+
+    // todo check if save successful
+    file.open(QIODevice::WriteOnly);
+    file.write(data.toUtf8());
+    file.close();
+
+#ifdef Q_OS_IOS
+    QStringList filesToSend;
+    filesToSend.append(fileUrl.toString());
+    MobileUtils::shareText(filesToSend);
+    return;
+#else
+    QFileInfo fi(fileUrl.toLocalFile());
+    QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
+#endif
+}
+
+QString SystemController::getFileName()
+{
+    auto mainFileDialog = m_qmlRoot->findChild<QObject>("mainFileDialog").parent();
+    if (!mainFileDialog) {
+        return "";
+    }
+    QMetaObject::invokeMethod(mainFileDialog, "open", Qt::DirectConnection);
+
+    QEventLoop wait;
+    QObject::connect(this, &SystemController::fileDialogAccepted, &wait, &QEventLoop::quit);
+    wait.exec();
+
+    auto fileName = mainFileDialog->property("selectedFile").toString();
+
+#ifdef Q_OS_IOS
+    CFURLRef url = CFURLCreateWithFileSystemPath(
+            kCFAllocatorDefault,
+            CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(fileName.unicode()), fileName.length()),
+            kCFURLPOSIXPathStyle, 0);
+
+    if (!CFURLStartAccessingSecurityScopedResource(url)) {
+        qDebug() << "Could not access path " << QUrl::fromLocalFile(fileName).toString();
+    }
+
+    return fileName;
+#endif
+
+#ifdef Q_OS_ANDROID
+    // patch for files containing spaces etc
+    const QString sep { "raw%3A%2F" };
+    if (fileName.startsWith("content://") && fileName.contains(sep)) {
+        QString contentUrl = fileName.split(sep).at(0);
+        QString rawUrl = fileName.split(sep).at(1);
+        rawUrl.replace(" ", "%20");
+        fileName = contentUrl + sep + rawUrl;
+    }
+
+    return fileName;
+#endif
+
+    return QUrl(fileName).toLocalFile();
+}
+
+void SystemController::setQmlRoot(QObject *qmlRoot)
+{
+    m_qmlRoot = qmlRoot;
+}

client/ui/controllers/systemController.h

@@ -0,0 +1,30 @@
+#ifndef SYSTEMCONTROLLER_H
+#define SYSTEMCONTROLLER_H
+
+#include <QObject>
+
+#include "settings.h"
+
+class SystemController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
+
+public slots:
+    void saveFile(QString fileName, const QString &data);
+    QString getFileName();
+
+    void setQmlRoot(QObject *qmlRoot);
+
+signals:
+    void fileDialogAccepted();
+    void fileDialogRejected();
+
+private:
+    std::shared_ptr<Settings> m_settings;
+
+    QObject *m_qmlRoot;
+};
+
+#endif // SYSTEMCONTROLLER_H