Fix iOS file opening issue

Author: timothyschoen

Source/Components/WelcomePanel.h

@@ -877,13 +877,13 @@ class WelcomePanel final : public Component
 
                 tile->onClick = [this, patchFile]() mutable {
                     if (patchFile.existsAsFile()) {
-                        editor->pd->autosave->checkForMoreRecentAutosave(patchFile, editor, [this](File patchFile, File patchPath) {
-                            auto* cnv = editor->getTabComponent().openPatch(URL(patchFile));
+                        editor->pd->autosave->checkForMoreRecentAutosave(URL(patchFile), editor, [this](URL const& patchFile, URL const& patchPath) {
+                            auto* cnv = editor->getTabComponent().openPatch(patchFile);
                             if(cnv)
                             {
-                                cnv->patch.setCurrentFile(URL(patchPath));
+                                cnv->patch.setCurrentFile(patchPath);
                             }
-                            SettingsFile::getInstance()->addToRecentlyOpened(patchPath);
+                            SettingsFile::getInstance()->addToRecentlyOpened(patchPath.getLocalFile());
                         });
                     } else {
                         editor->pd->logError("Patch not found");

Source/Dialogs/MainMenu.h

@@ -31,13 +31,13 @@ class MainMenu : public PopupMenu {
                 auto path = File(recentlyOpenedTree.getChild(i).getProperty("Path").toString());
                 recentlyOpened->addItem(path.getFileName(), [path, editor]() mutable {
                     if (path.existsAsFile()) {
-                        editor->pd->autosave->checkForMoreRecentAutosave(path, editor, [editor](File patchFile, File patchPath) {
-                            auto* cnv = editor->getTabComponent().openPatch(URL(patchFile));
+                        editor->pd->autosave->checkForMoreRecentAutosave(URL(path), editor, [editor](URL const& patchFile, URL const& patchPath) {
+                            auto* cnv = editor->getTabComponent().openPatch(patchFile);
                             if(cnv)
                             {
-                                cnv->patch.setCurrentFile(URL(patchPath));
+                                cnv->patch.setCurrentFile(patchPath);
                             }
-                            SettingsFile::getInstance()->addToRecentlyOpened(patchPath);
+                            SettingsFile::getInstance()->addToRecentlyOpened(patchPath.getLocalFile());
                         });
                     } else {
                         editor->pd->logError("Patch not found");

Source/PluginEditor.cpp

@@ -903,13 +903,13 @@ void PluginEditor::filesDropped(StringArray const& files, int const x, int const
         auto file = File(path);
         if (file.exists() && file.hasFileExtension("pd")) {
             openedPdFiles = true;
-            pd->autosave->checkForMoreRecentAutosave(file, this, [this](File patchFile, File patchPath) {
-                auto* cnv = tabComponent.openPatch(URL(patchFile));
+            pd->autosave->checkForMoreRecentAutosave(URL(file), this, [this](URL const& patchFile, URL const& patchPath) {
+                auto* cnv = tabComponent.openPatch(patchFile);
                 if(cnv)
                 {
-                    cnv->patch.setCurrentFile(URL(patchPath));
+                    cnv->patch.setCurrentFile(patchPath);
                 }
-                SettingsFile::getInstance()->addToRecentlyOpened(patchPath);
+                SettingsFile::getInstance()->addToRecentlyOpened(patchPath.getLocalFile());
             });
         }
         if (file.exists() && file.hasFileExtension("plugdata")) {

Source/TabComponent.cpp

@@ -377,13 +377,13 @@ void TabComponent::openPatch()
     Dialogs::showOpenDialog([this](URL resultURL) {
         auto result = resultURL.getLocalFile();
         if (result.exists() && result.getFileExtension().equalsIgnoreCase(".pd")) {
-            editor->pd->autosave->checkForMoreRecentAutosave(result, editor, [this, result, resultURL](File patchFile, File patchPath) {
-                auto* cnv = openPatch(URL(patchFile));
+            editor->pd->autosave->checkForMoreRecentAutosave(resultURL, editor, [this](URL const& patchFile, URL const& patchPath) {
+                auto* cnv = openPatch(patchFile);
                 if(cnv)
                 {
-                    cnv->patch.setCurrentFile(URL(patchPath));
+                    cnv->patch.setCurrentFile(patchPath);
                 }
-                SettingsFile::getInstance()->addToRecentlyOpened(patchPath);
+                SettingsFile::getInstance()->addToRecentlyOpened(patchPath.getLocalFile());
             });
         }
     },

Source/Utility/Autosave.h

@@ -38,16 +38,17 @@ class Autosave final : public Timer
     }
 
     // Call this whenever we load a file
-    static void checkForMoreRecentAutosave(File& patchPath, PluginEditor* editor, std::function<void(File, File)> callback)
+    static void checkForMoreRecentAutosave(URL const& patchUrl, PluginEditor* editor, std::function<void(URL const&, URL const&)> callback)
     {
+        auto patchPath = patchUrl.getLocalFile();
         auto lastAutoSavedPatch = autoSaveTree.getChildWithProperty("Path", patchPath.getFullPathName());
         auto const autoSavedTime = static_cast<int64>(lastAutoSavedPatch.getProperty("LastModified"));
         auto const fileChangedTime = patchPath.getLastModificationTime().toMilliseconds();
         if (lastAutoSavedPatch.isValid() && autoSavedTime > fileChangedTime) {
             auto const timeDescription = RelativeTime((autoSavedTime - fileChangedTime) / 1000.0f).getApproximateDescription();
 
             Dialogs::showMultiChoiceDialog(
-                &editor->openedDialog, editor, "Restore autosave?\n (last autosave is " + timeDescription + " newer)", [lastAutoSavedPatch, patchPath, callback, editor](int const dontUseAutosaved) {
+                &editor->openedDialog, editor, "Restore autosave?\n (last autosave is " + timeDescription + " newer)", [lastAutoSavedPatch, patchUrl, patchPath, callback, editor](int const dontUseAutosaved) {
                     if (!dontUseAutosaved) {
                         MemoryOutputStream ostream;
                         Base64::convertFromBase64(ostream, lastAutoSavedPatch.getProperty("Patch").toString());
@@ -56,16 +57,16 @@ class Autosave final : public Timer
                         glob_forcefilename(editor->pd->generateSymbol(patchPath.getFileName().toRawUTF8()), editor->pd->generateSymbol(patchPath.getParentDirectory().getFullPathName().replaceCharacter('\\', '/').toRawUTF8()));
                         auto patchFile = File::createTempFile(".pd");
                         patchFile.replaceWithText(autosavedPatch);
-                        callback(patchFile, patchPath);
+                        callback(URL(patchFile), patchUrl);
                     }
                     else {
-                        callback(patchPath, patchPath);
+                        callback(URL(patchPath), patchUrl);
                     }
 
                 },
                 { "Yes", "No" });
         } else {
-            callback(patchPath, patchPath);
+            callback(patchUrl, patchUrl);
         }
     }