Various improvements (#547)

- Fixed crash when returning to Setup app (from any of the steps)
- Fixed crash when returning to TimeDateSettings app (after locale selection)
- Fixed GuiService inconsistent behaviour: now always perform operations async (e.g. to show/hide apps). This fixes crashes in some onHide() calls where onHide() might be called before onShow() was called.
- Fix for incorrect WebServService path
- Remove CYD-4848S040C SD card functionality, but added a GPIO fix for releasing 3-wire SPI pin sharing.
- Fix for saving/loading settings for various apps

Tactility/Source/settings/BootSettings.cpp

@@ -1,7 +1,6 @@
 #include <Tactility/MountPoints.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/Logger.h>
 #include <Tactility/settings/BootSettings.h>
 
 #include <Tactility/Paths.h>
@@ -10,8 +9,6 @@
 
 namespace tt::settings {
 
-constexpr auto* TAG = "BootSettings";
-
 constexpr auto* PROPERTIES_FILE_FORMAT = "{}/settings/boot.properties";
 constexpr auto* PROPERTIES_KEY_LAUNCHER_APP_ID = "launcherAppId";
 constexpr auto* PROPERTIES_KEY_AUTO_START_APP_ID = "autoStartAppId";
@@ -22,6 +19,10 @@ static std::string getPropertiesFilePath() {
 
 bool loadBootSettings(BootSettings& properties) {
     const std::string path = getPropertiesFilePath();
+    if (!file::isFile(path)) {
+        return false;
+    }
+
     if (!file::loadPropertiesFile(path, [&properties](auto& key, auto& value) {
         if (key == PROPERTIES_KEY_AUTO_START_APP_ID) {
             properties.autoStartAppId = value;
@@ -29,7 +30,6 @@ bool loadBootSettings(BootSettings& properties) {
             properties.launcherAppId = value;
         }
     })) {
-        LOG_I(TAG, "No settings at %s", path.c_str());
         return false;
     }
 

Tactility/Source/settings/DisplaySettings.cpp

@@ -1,5 +1,6 @@
 #include <Tactility/settings/DisplaySettings.h>
 
+#include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/Paths.h>
 #include <tactility/hal/Device.h>
@@ -109,8 +110,13 @@ static bool fromString(const std::string& str, ScreensaverType& type) {
 }
 
 bool load(DisplaySettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(getSettingsFilePath(), map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -190,7 +196,11 @@ bool save(const DisplaySettings& settings) {
     map[SETTINGS_KEY_TIMEOUT_ENABLED] = settings.backlightTimeoutEnabled ? "1" : "0";
     map[SETTINGS_KEY_TIMEOUT_MS] = std::to_string(settings.backlightTimeoutMs);
     map[SETTINGS_KEY_SCREENSAVER_TYPE] = toString(settings.screensaverType);
-    return file::savePropertiesFile(getSettingsFilePath(), map);
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        return false;
+    }
+    return file::savePropertiesFile(settings_path, map);
 }
 
 lv_display_rotation_t toLvglDisplayRotation(Orientation orientation) {

Tactility/Source/settings/KeyboardSettings.cpp

@@ -1,4 +1,5 @@
 #include <Tactility/settings/KeyboardSettings.h>
+#include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/Paths.h>
 
@@ -17,8 +18,13 @@ constexpr auto* KEY_BACKLIGHT_TIMEOUT_ENABLED = "backlightTimeoutEnabled";
 constexpr auto* KEY_BACKLIGHT_TIMEOUT_MS = "backlightTimeoutMs";
 
 bool load(KeyboardSettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(getSettingsFilePath(), map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -58,7 +64,11 @@ bool save(const KeyboardSettings& settings) {
     map[KEY_BACKLIGHT_BRIGHTNESS] = std::to_string(settings.backlightBrightness);
     map[KEY_BACKLIGHT_TIMEOUT_ENABLED] = settings.backlightTimeoutEnabled ? "1" : "0";
     map[KEY_BACKLIGHT_TIMEOUT_MS] = std::to_string(settings.backlightTimeoutMs);
-    return file::savePropertiesFile(getSettingsFilePath(), map);
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        return false;
+    }
+    return file::savePropertiesFile(settings_path, map);
 }
 
 }

Tactility/Source/settings/SystemSettings.cpp

@@ -80,6 +80,11 @@ bool saveSystemSettings(const SystemSettings& properties) {
     map["timeFormat24h"] = properties.timeFormat24h ? "true" : "false";
     map["dateFormat"] = properties.dateFormat;
 
+    if (!file::findOrCreateParentDirectory(file_path, 0755)) {
+        LOGGER.error("Failed to create parent dir for {}", file_path);
+        return false;
+    }
+
     if (!file::savePropertiesFile(file_path, map)) {
         LOGGER.error("Failed to save {}", file_path);
         return false;

Tactility/Source/settings/TouchCalibrationSettings.cpp

@@ -1,5 +1,6 @@
 #include <Tactility/settings/TouchCalibrationSettings.h>
 
+#include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/Mutex.h>
 #include <Tactility/Paths.h>
@@ -64,8 +65,13 @@ bool isValid(const TouchCalibrationSettings& settings) {
 }
 
 bool load(TouchCalibrationSettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(getSettingsFilePath(), map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -116,7 +122,12 @@ bool save(const TouchCalibrationSettings& settings) {
     map[SETTINGS_KEY_Y_MIN] = std::to_string(settings.yMin);
     map[SETTINGS_KEY_Y_MAX] = std::to_string(settings.yMax);
 
-    if (!file::savePropertiesFile(getSettingsFilePath(), map)) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        return false;
+    }
+
+    if (!file::savePropertiesFile(settings_path, map)) {
         return false;
     }
 

Tactility/Source/settings/TrackballSettings.cpp

@@ -1,4 +1,5 @@
 #include <Tactility/settings/TrackballSettings.h>
+#include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/Paths.h>
 
@@ -23,8 +24,13 @@ constexpr uint8_t MIN_POINTER_SENSITIVITY = 1;
 constexpr uint8_t MAX_POINTER_SENSITIVITY = 10;
 
 bool load(TrackballSettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(getSettingsFilePath(), map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -84,7 +90,11 @@ bool save(const TrackballSettings& settings) {
     map[KEY_TRACKBALL_MODE] = (settings.trackballMode == TrackballMode::Pointer) ? "1" : "0";
     map[KEY_ENCODER_SENSITIVITY] = std::to_string(std::clamp(settings.encoderSensitivity, MIN_ENCODER_SENSITIVITY, MAX_ENCODER_SENSITIVITY));
     map[KEY_POINTER_SENSITIVITY] = std::to_string(std::clamp(settings.pointerSensitivity, MIN_POINTER_SENSITIVITY, MAX_POINTER_SENSITIVITY));
-    return file::savePropertiesFile(getSettingsFilePath(), map);
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        return false;
+    }
+    return file::savePropertiesFile(settings_path, map);
 }
 
 }

Tactility/Source/settings/WebServerSettings.cpp

@@ -90,8 +90,13 @@ static bool isEmptyCredential(const std::string& value) {
 }
 
 bool load(WebServerSettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(getSettingsFilePath(), map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -257,7 +262,12 @@ bool save(const WebServerSettings& settings) {
     map[KEY_WEBSERVER_USERNAME] = settings.webServerUsername;
     map[KEY_WEBSERVER_PASSWORD] = settings.webServerPassword;
 
-    return file::savePropertiesFile(getSettingsFilePath(), map);
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        LOGGER.error("Failed to create parent dir for {}", settings_path);
+        return false;
+    }
+    return file::savePropertiesFile(settings_path, map);
 }
 
 }