fixed conflicts after merge

2023-08-28 22:03:28 +03:00 · 2023-08-28 22:03:28 +03:00 · 8f6aa950cd
commit 8f6aa950cd
parent 36a2482165
6 changed files with 140 additions and 104 deletions
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@ -95,6 +95,18 @@ void SettingsController::restoreAppConfig()
    }

    QFile file(fileName);
+
+#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();
+    }
+#endif
+
    file.open(QIODevice::ReadOnly);
    QByteArray data = file.readAll();