From 77a574d601432f7b601d5efc2c09842798bae4e2 Mon Sep 17 00:00:00 2001
From: essej <jesse@essej.net>
Date: Sun, 26 Feb 2023 17:23:33 -0500
Subject: [PATCH 1/6] fixed version number on ios... this is actually the 1.6.2
 revision for mobile releases

---
 Source/OptionsView.cpp                              | 4 ----
 mobile/Builds/Android/app/CMakeLists.txt            | 6 +++---
 mobile/Builds/iOS/Info-AUv3_AppExtension.plist      | 2 +-
 mobile/Builds/iOS/Info-Standalone_Plugin.plist      | 2 +-
 mobile/Builds/iOS/SonoBus.xcodeproj/project.pbxproj | 8 --------
 mobile/JuceLibraryCode/JucePluginDefines.h          | 2 +-
 mobile/SonoBusMobile.jucer                          | 4 ++--
 7 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Source/OptionsView.cpp b/Source/OptionsView.cpp
index a05fff96..ac2d16cd 100644
--- a/Source/OptionsView.cpp
+++ b/Source/OptionsView.cpp
@@ -331,11 +331,7 @@ OptionsView::OptionsView(SonobusAudioProcessor& proc, std::function<AudioDeviceM
 
     
 
-#if JUCE_IOS
-    mVersionLabel = std::make_unique<Label>("", TRANS("Version: ") + String(SONOBUS_BUILD_VERSION)); // temporary
-#else
     mVersionLabel = std::make_unique<Label>("", TRANS("Version: ") + ProjectInfo::versionString);
-#endif
     configLabel(mVersionLabel.get(), true);
     mVersionLabel->setJustificationType(Justification::centredRight);
 
diff --git a/mobile/Builds/Android/app/CMakeLists.txt b/mobile/Builds/Android/app/CMakeLists.txt
index 644b4001..25c8e456 100644
--- a/mobile/Builds/Android/app/CMakeLists.txt
+++ b/mobile/Builds/Android/app/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory (${OBOE_DIR} ./oboe)
 add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
 set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
 
-add_definitions([[-DJUCE_ANDROID=1]] [[-DJUCE_ANDROID_API_VERSION=24]] [[-DJUCE_PUSH_NOTIFICATIONS=1]] [[-DJUCE_PUSH_NOTIFICATIONS_ACTIVITY="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCE_CONTENT_SHARING=1]] [[-DJUCE_ANDROID_GL_ES_VERSION_3_0=1]] [[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DSONOBUS_BUILD_VERSION="1.4.9-74"]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]])
+add_definitions([[-DJUCE_ANDROID=1]] [[-DJUCE_ANDROID_API_VERSION=24]] [[-DJUCE_PUSH_NOTIFICATIONS=1]] [[-DJUCE_PUSH_NOTIFICATIONS_ACTIVITY="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCE_CONTENT_SHARING=1]] [[-DJUCE_ANDROID_GL_ES_VERSION_3_0=1]] [[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]])
 
 include_directories( AFTER
     "../../../JuceLibraryCode"
@@ -30,7 +30,7 @@ if(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG")
         "../../../../deps/android/${ANDROID_ABI}"
     )
 
-    add_definitions([[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DSONOBUS_BUILD_VERSION="1.4.9-74"]] [[-DLOGLEVEL=2]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]] [[-DDEBUG=1]] [[-D_DEBUG=1]])
+    add_definitions([[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DLOGLEVEL=2]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]] [[-DDEBUG=1]] [[-D_DEBUG=1]])
     include_directories( AFTER
         "../../../../deps/aoo/lib"
         "../../../../deps/aoo/deps"
@@ -47,7 +47,7 @@ elseif(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE")
         "../../../../deps/android/${ANDROID_ABI}"
     )
 
-    add_definitions([[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DSONOBUS_BUILD_VERSION="1.4.9-74"]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]] [[-DNDEBUG=1]])
+    add_definitions([[-DJUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1]] [[-DUSE_CODEC_OPUS=1]] [[-DAOO_TIMEFILTER_CHECK=0]] [[-DAOO_STATIC]] [[-DJUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE=0]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSNAME="com_sonosaurus_sonobus_SonoBusActivity"]] [[-DJUCE_ANDROID_ACTIVITY_OVERRIDE_CLASSPATH="com/sonosaurus/sonobus/SonoBusActivity"]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=1.6.2]] [[-DJUCE_APP_VERSION_HEX=0x10602]] [[-DNDEBUG=1]])
     include_directories( AFTER
         "../../../../deps/aoo/lib"
         "../../../../deps/aoo/deps"
diff --git a/mobile/Builds/iOS/Info-AUv3_AppExtension.plist b/mobile/Builds/iOS/Info-AUv3_AppExtension.plist
index bd5d7e5e..317b7d40 100644
--- a/mobile/Builds/iOS/Info-AUv3_AppExtension.plist
+++ b/mobile/Builds/iOS/Info-AUv3_AppExtension.plist
@@ -45,7 +45,7 @@
     <key>CFBundleShortVersionString</key>
     <string>1.6.2</string>
     <key>CFBundleVersion</key>
-    <string>80</string>
+    <string>81</string>
     <key>NSHumanReadableCopyright</key>
     <string>2023 Sonosaurus LLC</string>
     <key>NSHighResolutionCapable</key>
diff --git a/mobile/Builds/iOS/Info-Standalone_Plugin.plist b/mobile/Builds/iOS/Info-Standalone_Plugin.plist
index f95cec28..48163f90 100644
--- a/mobile/Builds/iOS/Info-Standalone_Plugin.plist
+++ b/mobile/Builds/iOS/Info-Standalone_Plugin.plist
@@ -45,7 +45,7 @@
     <key>CFBundleShortVersionString</key>
     <string>1.6.2</string>
     <key>CFBundleVersion</key>
-    <string>80</string>
+    <string>81</string>
     <key>NSHumanReadableCopyright</key>
     <string>2023 Sonosaurus LLC</string>
     <key>NSHighResolutionCapable</key>
diff --git a/mobile/Builds/iOS/SonoBus.xcodeproj/project.pbxproj b/mobile/Builds/iOS/SonoBus.xcodeproj/project.pbxproj
index 639c8454..a5ae6a72 100644
--- a/mobile/Builds/iOS/SonoBus.xcodeproj/project.pbxproj
+++ b/mobile/Builds/iOS/SonoBus.xcodeproj/project.pbxproj
@@ -1280,7 +1280,6 @@
 					"NDEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"USE_CODEC_OPUS=1",
 					"AOO_TIMEFILTER_CHECK=0",
 					"AOO_STATIC",
@@ -1344,7 +1343,6 @@
 					"NDEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"USE_CODEC_OPUS=1",
 					"AOO_TIMEFILTER_CHECK=0",
 					"AOO_STATIC",
@@ -1409,7 +1407,6 @@
 					"NDEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"USE_CODEC_OPUS=1",
 					"AOO_TIMEFILTER_CHECK=0",
 					"AOO_STATIC",
@@ -1471,7 +1468,6 @@
 					"NDEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"USE_CODEC_OPUS=1",
 					"AOO_TIMEFILTER_CHECK=0",
 					"AOO_STATIC",
@@ -1536,7 +1532,6 @@
 					"DEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"LOGLEVEL=2",
 					"JUCE_IOS_AUDIO_LOGGING=1",
 					"USE_CODEC_OPUS=1",
@@ -1651,7 +1646,6 @@
 					"DEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"LOGLEVEL=2",
 					"JUCE_IOS_AUDIO_LOGGING=1",
 					"USE_CODEC_OPUS=1",
@@ -1767,7 +1761,6 @@
 					"DEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"LOGLEVEL=2",
 					"JUCE_IOS_AUDIO_LOGGING=1",
 					"USE_CODEC_OPUS=1",
@@ -1833,7 +1826,6 @@
 					"DEBUG=1",
 					"JUCE_CONTENT_SHARING=1",
 					"JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
-					"SONOBUS_BUILD_VERSION=\\\"1.4.9-74\\\"",
 					"LOGLEVEL=2",
 					"JUCE_IOS_AUDIO_LOGGING=1",
 					"USE_CODEC_OPUS=1",
diff --git a/mobile/JuceLibraryCode/JucePluginDefines.h b/mobile/JuceLibraryCode/JucePluginDefines.h
index 39bc7ed1..e2f7477f 100644
--- a/mobile/JuceLibraryCode/JucePluginDefines.h
+++ b/mobile/JuceLibraryCode/JucePluginDefines.h
@@ -155,7 +155,7 @@
  #define JucePlugin_ARAFactoryID           "com.Sonosaurus.SonoBus.factory"
 #endif
 #ifndef  JucePlugin_ARADocumentArchiveID
- #define JucePlugin_ARADocumentArchiveID   "com.Sonosaurus.SonoBus.aradocumentarchive.1.6.1"
+ #define JucePlugin_ARADocumentArchiveID   "com.Sonosaurus.SonoBus.aradocumentarchive.1.6.2"
 #endif
 #ifndef  JucePlugin_ARACompatibleArchiveIDs
  #define JucePlugin_ARACompatibleArchiveIDs  ""
diff --git a/mobile/SonoBusMobile.jucer b/mobile/SonoBusMobile.jucer
index ccb8c510..538bd205 100644
--- a/mobile/SonoBusMobile.jucer
+++ b/mobile/SonoBusMobile.jucer
@@ -3,7 +3,7 @@
 <JUCERPROJECT id="ZRovAH" name="SonoBus" projectType="audioplug" companyName="Sonosaurus"
               companyCopyright="2023 Sonosaurus LLC" companyEmail="support@sonosaurus.com"
               pluginFormats="buildAUv3,buildStandalone,enableIAA" pluginManufacturerCode="Sono"
-              pluginCode="NBus" defines="JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1&#10;SONOBUS_BUILD_VERSION=&quot;1.4.9-74&quot;&#10;"
+              pluginCode="NBus" defines="JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1&#10;&#10;"
               pluginDesc="SonoBus - Network Audio" version="1.6.2" cppLanguageStandard="17"
               projectLineFeed="&#10;" jucerFormatVersion="1" pluginAUMainType="'aufx'"
               pluginAUIsSandboxSafe="1">
@@ -397,7 +397,7 @@
                   UISupportsDocumentBrowser="1" UIFileSharingEnabled="1" customLaunchStoryboard="../images/LaunchScreen.storyboard"
                   iosScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight,UIInterfaceOrientationPortrait,UIInterfaceOrientationPortraitUpsideDown"
                   iPadScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight,UIInterfaceOrientationPortrait,UIInterfaceOrientationPortraitUpsideDown"
-                  UIRequiresFullScreen="0" buildNumber="80">
+                  UIRequiresFullScreen="0" buildNumber="81">
       <CONFIGURATIONS>
         <CONFIGURATION isDebug="1" name="Debug" headerPath="../../../deps/aoo/lib&#10;../../../deps/aoo/deps&#10;../../../deps/ios/include&#10;"
                        libraryPath="../../../deps/ios/lib" defines="LOGLEVEL=2&#10;JUCE_IOS_AUDIO_LOGGING=1"

From 4b8c91d706a7c5731cfcd48c60ccb3bf7c5373e7 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Sun, 19 Mar 2023 23:10:02 +0100
Subject: [PATCH 2/6] Fix file picker on platforms reported to not have a
 native one (#179)

Closes #174
---
 Source/ChatView.cpp            |  54 +++---
 Source/OptionsView.cpp         |  90 +++++-----
 Source/SonobusPluginEditor.cpp | 315 +++++++++++++++------------------
 3 files changed, 209 insertions(+), 250 deletions(-)

diff --git a/Source/ChatView.cpp b/Source/ChatView.cpp
index a8cc001b..42985cdc 100644
--- a/Source/ChatView.cpp
+++ b/Source/ChatView.cpp
@@ -648,50 +648,44 @@ void ChatView::showSaveChat()
 {
     SafePointer<ChatView> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
-        File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
+    File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
 
-        // TODO - on iOS we need to give it a name first
+    // TODO - on iOS we need to give it a name first
 //#if (JUCE_IOS || JUCE_ANDROID)
-        String filename = String("SonoBusChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
-        recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt");
+    String filename = String("SonoBusChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
+    recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt");
 //#endif
 
-        mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
-                                           recdir,
-                                           "*.txt",
-                                           true, false, getTopLevelComponent()));
+    mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
+                                       recdir,
+                                       "*.txt",
+                                       true, false, getTopLevelComponent()));
 
 
 
-        mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
-                                   [safeThis] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
+    mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
+                               [safeThis] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
 
-                DBG("Chose file to save chat: " <<  url.toString(false));
+            DBG("Chose file to save chat: " <<  url.toString(false));
 
-                if (url.isLocalFile()) {
-                    File lfile = url.getLocalFile();
+            if (url.isLocalFile()) {
+                File lfile = url.getLocalFile();
 
-                    lfile.replaceWithText(safeThis->mChatTextEditor->getText());
-                }
+                lfile.replaceWithText(safeThis->mChatTextEditor->getText());
             }
+        }
 
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
-            }
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
 
-        }, nullptr);
+    }, nullptr);
 
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
 }
 
 
diff --git a/Source/OptionsView.cpp b/Source/OptionsView.cpp
index ac2d16cd..8f0b01b4 100644
--- a/Source/OptionsView.cpp
+++ b/Source/OptionsView.cpp
@@ -1203,69 +1203,63 @@ void OptionsView::chooseRecDirBrowser()
 {
     SafePointer<OptionsView> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
-        File recdir;
-        if (processor.getDefaultRecordingDirectory().isLocalFile()) {
-            recdir = processor.getDefaultRecordingDirectory().getLocalFile();
-        }
+    File recdir;
+    if (processor.getDefaultRecordingDirectory().isLocalFile()) {
+        recdir = processor.getDefaultRecordingDirectory().getLocalFile();
+    }
 
-        mFileChooser.reset(new FileChooser(TRANS("Choose the folder for new recordings"),
-                                           recdir,
-                                           "",
-                                           true, false, getTopLevelComponent()));
+    mFileChooser.reset(new FileChooser(TRANS("Choose the folder for new recordings"),
+                                       recdir,
+                                       "",
+                                       true, false, getTopLevelComponent()));
 
 
-        int modes = FileBrowserComponent::canSelectDirectories | FileBrowserComponent::openMode;
-        mFileChooser->launchAsync (modes,
-                                   [safeThis] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
+    int modes = FileBrowserComponent::canSelectDirectories | FileBrowserComponent::openMode;
+    mFileChooser->launchAsync (modes,
+                               [safeThis] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
 
-                DBG("Chose directory: " <<  url.toString(false));
+            DBG("Chose directory: " <<  url.toString(false));
 
 #if JUCE_ANDROID
-                auto docdir = AndroidDocument::fromTree(url);
-                if (!docdir.hasValue()) {
-                    docdir = AndroidDocument::fromFile(url.getLocalFile());
-                }
-                
-                if (docdir.hasValue()) {
-                    AndroidDocumentPermission::takePersistentReadWriteAccess(url);
-                    if (docdir.getInfo().isDirectory()) {
-                        safeThis->processor.setDefaultRecordingDirectory(url);
-                    }
+            auto docdir = AndroidDocument::fromTree(url);
+            if (!docdir.hasValue()) {
+                docdir = AndroidDocument::fromFile(url.getLocalFile());
+            }
+            
+            if (docdir.hasValue()) {
+                AndroidDocumentPermission::takePersistentReadWriteAccess(url);
+                if (docdir.getInfo().isDirectory()) {
+                    safeThis->processor.setDefaultRecordingDirectory(url);
                 }
+            }
 #else
-                if (url.isLocalFile()) {
-                    File lfile = url.getLocalFile();
-                    if (lfile.isDirectory()) {
-                        safeThis->processor.setDefaultRecordingDirectory(url);
-                    } else {
-                        auto parurl = URL(lfile.getParentDirectory());
-                        safeThis->processor.setDefaultRecordingDirectory(parurl);
-                    }
-
+            if (url.isLocalFile()) {
+                File lfile = url.getLocalFile();
+                if (lfile.isDirectory()) {
+                    safeThis->processor.setDefaultRecordingDirectory(url);
+                } else {
+                    auto parurl = URL(lfile.getParentDirectory());
+                    safeThis->processor.setDefaultRecordingDirectory(parurl);
                 }
+
+            }
 #endif
 
-                safeThis->updateState();
+            safeThis->updateState();
 
-            }
+        }
 
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
-            }
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
 
-        }, nullptr);
+    }, nullptr);
 
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
 }
 
 
diff --git a/Source/SonobusPluginEditor.cpp b/Source/SonobusPluginEditor.cpp
index 5557652f..ec271765 100644
--- a/Source/SonobusPluginEditor.cpp
+++ b/Source/SonobusPluginEditor.cpp
@@ -2360,134 +2360,119 @@ void SonobusAudioProcessorEditor::requestRecordDir(std::function<void (URL)> cal
 {
     SafePointer<SonobusAudioProcessorEditor> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
-        
-        DBG("Requesting recdir");
-        
-        File initopendir = mCurrOpenDir;
+    DBG("Requesting recdir");
+    
+    File initopendir = mCurrOpenDir;
 #if JUCE_ANDROID
-        initopendir = File::getSpecialLocation(File::SpecialLocationType::userMusicDirectory);
-        // doens't work
+    initopendir = File::getSpecialLocation(File::SpecialLocationType::userMusicDirectory);
+    // doens't work
 #endif
-        
-        mFileChooser.reset(new FileChooser(TRANS("Choose a location to store recorded files."),
-                                           initopendir,
-                                           "",
-                                           true, false, getTopLevelComponent()));
-        
-        
-        
-        mFileChooser->launchAsync (FileBrowserComponent::openMode | FileBrowserComponent::canSelectDirectories,
-                                   [safeThis,callback] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
-                
-                DBG("Chosen recdir to save in: " <<  url.toString(false));
-                
+    
+    mFileChooser.reset(new FileChooser(TRANS("Choose a location to store recorded files."),
+                                       initopendir,
+                                       "",
+                                       true, false, getTopLevelComponent()));
+    
+    
+    
+    mFileChooser->launchAsync (FileBrowserComponent::openMode | FileBrowserComponent::canSelectDirectories,
+                               [safeThis,callback] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
+            
+            DBG("Chosen recdir to save in: " <<  url.toString(false));
+            
 #if JUCE_ANDROID
-                auto docdir = AndroidDocument::fromTree(url);
-                if (!docdir.hasValue()) {
-                    docdir = AndroidDocument::fromFile(url.getLocalFile());
-                }
-                
-                if (docdir.hasValue()) {
-                    AndroidDocumentPermission::takePersistentReadWriteAccess(url);
-                    if (docdir.getInfo().isDirectory()) {
-                        safeThis->processor.setDefaultRecordingDirectory(url);
-                    }
+            auto docdir = AndroidDocument::fromTree(url);
+            if (!docdir.hasValue()) {
+                docdir = AndroidDocument::fromFile(url.getLocalFile());
+            }
+            
+            if (docdir.hasValue()) {
+                AndroidDocumentPermission::takePersistentReadWriteAccess(url);
+                if (docdir.getInfo().isDirectory()) {
+                    safeThis->processor.setDefaultRecordingDirectory(url);
                 }
+            }
 #else
-                if (url.isLocalFile()) {
-                    File lfile = url.getLocalFile();
-                    if (lfile.isDirectory()) {
-                        safeThis->processor.setDefaultRecordingDirectory(url);
-                    } else {
-                        auto parurl = URL(lfile.getParentDirectory());
-                        safeThis->processor.setDefaultRecordingDirectory(parurl);
-                    }
-
-                }
-#endif
-                
-                if (url.isLocalFile()) {
-                    safeThis->mCurrOpenDir = url.getLocalFile();
-                    safeThis->processor.setLastBrowseDirectory(safeThis->mCurrOpenDir.getFullPathName());
+            if (url.isLocalFile()) {
+                File lfile = url.getLocalFile();
+                if (lfile.isDirectory()) {
+                    safeThis->processor.setDefaultRecordingDirectory(url);
+                } else {
+                    auto parurl = URL(lfile.getParentDirectory());
+                    safeThis->processor.setDefaultRecordingDirectory(parurl);
                 }
 
-                callback(url);
             }
+#endif
             
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
+            if (url.isLocalFile()) {
+                safeThis->mCurrOpenDir = url.getLocalFile();
+                safeThis->processor.setLastBrowseDirectory(safeThis->mCurrOpenDir.getFullPathName());
             }
-                        
-        }, nullptr);
+
+            callback(url);
+        }
         
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
+                    
+    }, nullptr);
 }
 
 void SonobusAudioProcessorEditor::openFileBrowser()
 {
     SafePointer<SonobusAudioProcessorEditor> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
 #if !(JUCE_IOS || JUCE_ANDROID)
-        if (mCurrOpenDir.getFullPathName().isEmpty()) {
-            mCurrOpenDir = File(processor.getLastBrowseDirectory());
-            DBG("curr open dir is: " << mCurrOpenDir.getFullPathName());
-            
-        }
-#endif
+    if (mCurrOpenDir.getFullPathName().isEmpty()) {
+        mCurrOpenDir = File(processor.getLastBrowseDirectory());
+        DBG("curr open dir is: " << mCurrOpenDir.getFullPathName());
         
-        mFileChooser.reset(new FileChooser(TRANS("Choose an audio file to open..."),
-                                           mCurrOpenDir,
+    }
+#endif
+    
+    mFileChooser.reset(new FileChooser(TRANS("Choose an audio file to open..."),
+                                       mCurrOpenDir,
 #if (JUCE_IOS || JUCE_MAC)
-                                           "*.wav;*.flac;*.aif;*.ogg;*.mp3;*.m4a;*.caf",
+                                       "*.wav;*.flac;*.aif;*.ogg;*.mp3;*.m4a;*.caf",
 #else
-                                           "*.wav;*.flac;*.aif;*.ogg;*.mp3",
+                                       "*.wav;*.flac;*.aif;*.ogg;*.mp3",
 #endif
-                                           true, false, getTopLevelComponent()));
-        
-        
-        
-        mFileChooser->launchAsync (FileBrowserComponent::openMode | FileBrowserComponent::canSelectFiles,
-                                   [safeThis] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
-                
-                DBG("Attempting to load from: " <<  url.toString(false));
-                
-                if (url.isLocalFile()) {
-                    safeThis->mCurrOpenDir = url.getLocalFile().getParentDirectory();
-                    safeThis->processor.setLastBrowseDirectory(safeThis->mCurrOpenDir.getFullPathName());
-                }
-
-                safeThis->loadAudioFromURL(url);
-            }
-            
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
-            }
+                                       true, false, getTopLevelComponent()));
+    
+    
+    
+    mFileChooser->launchAsync (FileBrowserComponent::openMode | FileBrowserComponent::canSelectFiles,
+                               [safeThis] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
             
-            safeThis->mDragDropBg->setVisible(false);    
+            DBG("Attempting to load from: " <<  url.toString(false));
             
-        }, nullptr);
+            if (url.isLocalFile()) {
+                safeThis->mCurrOpenDir = url.getLocalFile().getParentDirectory();
+                safeThis->processor.setLastBrowseDirectory(safeThis->mCurrOpenDir.getFullPathName());
+            }
+
+            safeThis->loadAudioFromURL(url);
+        }
         
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
+        
+        safeThis->mDragDropBg->setVisible(false);    
+        
+    }, nullptr);
 }
 
 
@@ -2497,52 +2482,45 @@ void SonobusAudioProcessorEditor::showSaveSettingsPreset()
 
     SafePointer<SonobusAudioProcessorEditor> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
-        File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
-        String * recentsfolder = nullptr;
-        if (getLastRecentsFolder) {
-            if ((recentsfolder = getLastRecentsFolder()) != nullptr) {
-                recdir = File(*recentsfolder);
-            }
+    File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
+    String * recentsfolder = nullptr;
+    if (getLastRecentsFolder) {
+        if ((recentsfolder = getLastRecentsFolder()) != nullptr) {
+            recdir = File(*recentsfolder);
         }
-        // TODO - on iOS we need to give it a name first
-
-        mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
-                                           recdir,
-                                           "*.sonobus",
-                                           true, false, getTopLevelComponent()));
+    }
+    // TODO - on iOS we need to give it a name first
 
+    mFileChooser.reset(new FileChooser(TRANS("Choose a location and name to store the setup"),
+                                       recdir,
+                                       "*.sonobus",
+                                       true, false, getTopLevelComponent()));
 
 
-        mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
-                                   [safeThis] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
 
-                DBG("Chose directory: " <<  url.toString(false));
+    mFileChooser->launchAsync (FileBrowserComponent::saveMode | FileBrowserComponent::doNotClearFileNameOnRootChange,
+                               [safeThis] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
 
-                if (url.isLocalFile()) {
-                    File lfile = url.getLocalFile();
+            DBG("Chose directory: " <<  url.toString(false));
 
-                    // save settings
-                    safeThis->saveSettingsToFile(lfile);
-                }
-            }
+            if (url.isLocalFile()) {
+                File lfile = url.getLocalFile();
 
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
+                // save settings
+                safeThis->saveSettingsToFile(lfile);
             }
+        }
 
-        }, nullptr);
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
 
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
+    }, nullptr);
 }
 
 void SonobusAudioProcessorEditor::showLoadSettingsPreset()
@@ -2551,51 +2529,44 @@ void SonobusAudioProcessorEditor::showLoadSettingsPreset()
 
     SafePointer<SonobusAudioProcessorEditor> safeThis (this);
 
-    if (FileChooser::isPlatformDialogAvailable())
-    {
-        File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
-        String * recentsfolder = nullptr;
-        if (getLastRecentsFolder) {
-            if ((recentsfolder = getLastRecentsFolder()) != nullptr) {
-                recdir = File(*recentsfolder);
-            }
+    File recdir; // = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("SonoBus Setups");
+    String * recentsfolder = nullptr;
+    if (getLastRecentsFolder) {
+        if ((recentsfolder = getLastRecentsFolder()) != nullptr) {
+            recdir = File(*recentsfolder);
         }
+    }
 
-        mFileChooser.reset(new FileChooser(TRANS("Choose a setup file to load"),
-                                           recdir,
-                                           "*.sonobus",
-                                           true, false, getTopLevelComponent()));
-
+    mFileChooser.reset(new FileChooser(TRANS("Choose a setup file to load"),
+                                       recdir,
+                                       "*.sonobus",
+                                       true, false, getTopLevelComponent()));
 
 
-        mFileChooser->launchAsync (FileBrowserComponent::openMode|FileBrowserComponent::canSelectFiles,
-                                   [safeThis] (const FileChooser& chooser) mutable
-                                   {
-            auto results = chooser.getURLResults();
-            if (safeThis != nullptr && results.size() > 0)
-            {
-                auto url = results.getReference (0);
 
-                DBG("Chose file: " <<  url.toString(false));
+    mFileChooser->launchAsync (FileBrowserComponent::openMode|FileBrowserComponent::canSelectFiles,
+                               [safeThis] (const FileChooser& chooser) mutable
+                               {
+        auto results = chooser.getURLResults();
+        if (safeThis != nullptr && results.size() > 0)
+        {
+            auto url = results.getReference (0);
 
-                if (url.isLocalFile()) {
-                    File lfile = url.getLocalFile();
+            DBG("Chose file: " <<  url.toString(false));
 
-                    // load settings
-                    safeThis->loadSettingsFromFile(lfile);
-                }
-            }
+            if (url.isLocalFile()) {
+                File lfile = url.getLocalFile();
 
-            if (safeThis) {
-                safeThis->mFileChooser.reset();
+                // load settings
+                safeThis->loadSettingsFromFile(lfile);
             }
+        }
 
-        }, nullptr);
+        if (safeThis) {
+            safeThis->mFileChooser.reset();
+        }
 
-    }
-    else {
-        DBG("Need to enable code signing");
-    }
+    }, nullptr);
 }
 
 bool SonobusAudioProcessorEditor::loadSettingsFromFile(const File & file)

From 7671bfcfe9b6bdaabaebf46dee04b5a13fe40bd6 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Mon, 27 Feb 2023 17:44:34 +0100
Subject: [PATCH 3/6] Replace hard-coded default server host with
 DEFAULT_SERVER_HOST

---
 Source/ConnectView.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/ConnectView.cpp b/Source/ConnectView.cpp
index 89d3e0e4..4ba06be9 100644
--- a/Source/ConnectView.cpp
+++ b/Source/ConnectView.cpp
@@ -819,7 +819,7 @@ void ConnectView::publicGroupLogin()
     DBG("Public host enter pressed");
     // parse it
     StringArray toks = StringArray::fromTokens(hostport, ":", "");
-    String host = "aoo.sonobus.net";
+    String host = DEFAULT_SERVER_HOST;
     int port = DEFAULT_SERVER_PORT;
 
     if (toks.size() >= 1) {
@@ -866,7 +866,7 @@ bool ConnectView::copyInfoToClipboard(bool singleURL, String * retmessage)
 
     String hostport = mServerHostEditor->getText();
     if (hostport.isEmpty()) {
-        hostport = "aoo.sonobus.net";
+        hostport = DEFAULT_SERVER_HOST;
     }
 
     String groupName;
@@ -1028,7 +1028,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
 
         // parse it
         StringArray toks = StringArray::fromTokens(hostport, ":", "");
-        String host = "aoo.sonobus.net";
+        String host = DEFAULT_SERVER_HOST;
         int port = DEFAULT_SERVER_PORT;
 
         if (toks.size() >= 1) {
@@ -1059,7 +1059,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
 
         // parse it
         StringArray toks = StringArray::fromTokens(hostport, ":", "");
-        String host = "aoo.sonobus.net";
+        String host = DEFAULT_SERVER_HOST;
         int port = DEFAULT_SERVER_PORT;
 
         if (toks.size() >= 1) {
@@ -1576,7 +1576,7 @@ void ConnectView::RecentsListModel::paintListBoxItem (int rowNumber, Graphics &g
 
     infostr += TRANS("on") + " " + Time(info.timestamp).toString(true, true, false) + " " ;
 
-    if (info.serverHost != "aoo.sonobus.net") {
+    if (info.serverHost != DEFAULT_SERVER_HOST) {
         infostr += TRANS("to") + " " +  info.serverHost;
     }
 

From 22fb2012e76b1e78b37a174ade0c567690f84874 Mon Sep 17 00:00:00 2001
From: essej <jesse@essej.net>
Date: Sun, 19 Mar 2023 19:19:35 -0400
Subject: [PATCH 4/6] updated for chinese translation

---
 CMakeLists.txt                                              | 1 +
 Source/OptionsView.cpp                                      | 5 +++--
 localization/{localized_zh-CN.txt => localized_zh-hans.txt} | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename localization/{localized_zh-CN.txt => localized_zh-hans.txt} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3feb8a4..329eb91e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -460,6 +460,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
         localization/localized_pt-pt.txt
         localization/localized_ko.txt
         localization/localized_ru.txt
+	localization/localized_zh-hans.txt
         images/bar_click.wav
         images/beat_click.wav
         images/chat.svg
diff --git a/Source/OptionsView.cpp b/Source/OptionsView.cpp
index 8f0b01b4..acb82f4e 100644
--- a/Source/OptionsView.cpp
+++ b/Source/OptionsView.cpp
@@ -56,8 +56,9 @@ void OptionsView::initializeLanguages()
     languages.add(TRANS("Korean")); languagesNative.add("Korean"); codes.add("ko"); // TODO fix and use above when we have a font that can display this all the time
     languages.add(TRANS("Russian"));  languagesNative.add(juce::CharPointer_UTF8 ("p\xd1\x83\xd1\x81\xd1\x81\xd0\xba\xd0\xb8\xd0\xb9")); codes.add("ru");
 
-    //languages.add(TRANS("Chinese (Simplified)")); languagesNative.add(CharPointer_UTF8 ("\xe4\xb8\xad\xe6\x96\x87\xef\xbc\x88\xe7\xae\x80\xe4\xbd\x93\xef\xbc\x89")); codes.add("zh_hans");
-    //languages.add(TRANS("Chinese (Traditional)")); languagesNative.add(CharPointer_UTF8 ("\xe4\xb8\xad\xe6\x96\x87\xef\xbc\x88\xe7\xb9\x81\xe9\xab\x94\xef\xbc\x89")); codes.add("zh_hant");
+    languages.add(TRANS("Chinese (Simplified)")); languagesNative.add("Chinese (Simplified)"); codes.add("zh-hans");
+    //languages.add(TRANS("Chinese (Simplified)")); languagesNative.add(CharPointer_UTF8 ("\xe4\xb8\xad\xe6\x96\x87\xef\xbc\x88\xe7\xae\x80\xe4\xbd\x93\xef\xbc\x89")); codes.add("zh_hans");languages.add(TRANS("Chinese (Simplified)")); languagesNative.add(CharPointer_UTF8 ("\xe4\xb8\xad\xe6\x96\x87\xef\xbc\x88\xe7\xae\x80\xe4\xbd\x93\xef\xbc\x89")); codes.add("zh-hans");
+    //languages.add(TRANS("Chinese (Traditional)")); languagesNative.add(CharPointer_UTF8 ("\xe4\xb8\xad\xe6\x96\x87\xef\xbc\x88\xe7\xb9\x81\xe9\xab\x94\xef\xbc\x89")); codes.add("zh-hant");
 
     // TOOD - parse any user files with localized_%s.txt in our settings folder and add as options if not existing already
 
diff --git a/localization/localized_zh-CN.txt b/localization/localized_zh-hans.txt
similarity index 100%
rename from localization/localized_zh-CN.txt
rename to localization/localized_zh-hans.txt

From e8217f690d8151da5e941e1c359f4da66e019014 Mon Sep 17 00:00:00 2001
From: essej <jesse@essej.net>
Date: Sun, 19 Mar 2023 19:20:03 -0400
Subject: [PATCH 5/6] fixed plugin not auto-reconnecting to last group on load

---
 Source/SonobusPluginProcessor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/SonobusPluginProcessor.cpp b/Source/SonobusPluginProcessor.cpp
index 7b7cf471..ab4f921c 100644
--- a/Source/SonobusPluginProcessor.cpp
+++ b/Source/SonobusPluginProcessor.cpp
@@ -834,6 +834,8 @@ mState (*this, &mUndoManager, "SonoBusAoO",
     
     initializeAoo();
 
+    mFreshInit = false; // need to ensure this before loaddefaultpluginstate
+
     if (isplugin) {
         loadDefaultPluginSettings();
     }
@@ -841,6 +843,8 @@ mState (*this, &mUndoManager, "SonoBusAoO",
     loadGlobalState();
     
     moveOldMisplacedFiles();
+
+    mFreshInit = true;
 }
 
 

From ac3ae14fd4748f840e403c4f40959158940d2f07 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Mon, 20 Mar 2023 16:00:43 +0100
Subject: [PATCH 6/6] Use a [P] prefix for public groups recents list (#166)

This is consistent with the group name as shown while inside the
group and takes less space.
---
 Source/ConnectView.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/ConnectView.cpp b/Source/ConnectView.cpp
index 4ba06be9..e4cad099 100644
--- a/Source/ConnectView.cpp
+++ b/Source/ConnectView.cpp
@@ -1557,7 +1557,9 @@ void ConnectView::RecentsListModel::paintListBoxItem (int rowNumber, Graphics &g
     float iconsize = height*yratio;
     float groupheight = height*yratio;
     g.drawImageWithin(groupImage, 0, 0, iconsize, iconsize, RectanglePlacement::fillDestination);
-    g.drawFittedText (info.groupName, iconsize + 4, 0, adjwidth*xratio - 8 - iconsize, groupheight, Justification::centredLeft, true);
+    String grouptext;
+    grouptext << (info.groupIsPublic ? TRANS("[P] ") : "") << info.groupName;
+    g.drawFittedText (grouptext, iconsize + 4, 0, adjwidth*xratio - 8 - iconsize, groupheight, Justification::centredLeft, true);
 
     g.setFont (parent->recentsNameFont);
     g.setColour (parent->findColour(nameTextColourId).withAlpha(0.8f));