Merge flip_wifi from https://github.com/jblanked/FlipWiFi

flip_wifi/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.1
+- Fixed a crash when setting an SSID in the Saved APs view.
+- Fixed auto-update functionality.
+
 ## v1.5
 - Added AP mode (host a network and display a custom HTML)
 - Restructured the code.

flip_wifi/application.fam

@@ -9,6 +9,6 @@ App(
     fap_icon_assets="assets",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/FlipWiFi",
-    fap_version="1.5",
+    fap_version="1.5.1",
     fap_description="FlipperHTTP companion app.",
 )

flip_wifi/callback/alloc.c

@@ -318,7 +318,9 @@ bool alloc_widgets(void *context, uint32_t widget)
     case FlipWiFiViewAbout:
         if (!app->widget_info)
         {
-            if (!easy_flipper_set_widget(&app->widget_info, FlipWiFiViewAbout, "FlipWiFi v1.4\n-----\nFlipperHTTP companion app.\nScan and save WiFi networks.\n-----\nwww.github.com/jblanked", callback_to_submenu_main, &app->view_dispatcher))
+            char about_text[128];
+            snprintf(about_text, sizeof(about_text), "FlipWiFi v%s\n-----\nFlipperHTTP companion app.\nScan and save WiFi networks.\n-----\nwww.github.com/jblanked", VERSION);
+            if (!easy_flipper_set_widget(&app->widget_info, FlipWiFiViewAbout, about_text, callback_to_submenu_main, &app->view_dispatcher))
             {
                 return false;
             }

flip_wifi/callback/callback.c

@@ -214,17 +214,18 @@ bool callback_view_input_callback_saved(InputEvent *event, void *context)
             furi_delay_ms(100);
         }
 
-        flipper_http_free(fhttp);
-
-        // check success (if [SUCCESS] is in the response)
+                // check success (if [SUCCESS] is in the response)
         if (strstr(fhttp->last_response, "[SUCCESS]") == NULL)
         {
-            char response[512];
+            char response[256];
             snprintf(response, sizeof(response), "Failed to save WiFi settings:\n%s", fhttp->last_response);
             easy_flipper_dialog("[ERROR]", response);
+            flipper_http_free(fhttp);
             return false;
         }
 
+        flipper_http_free(fhttp);
+
         easy_flipper_dialog("[SUCCESS]", "All FlipperHTTP apps will now\nuse the selected network.");
         return true;
     }

flip_wifi/flip_wifi.h

@@ -6,7 +6,7 @@
 #include <storage/storage.h>
 
 #define TAG "FlipWiFi"
-#define VERSION "1.5"
+#define VERSION "1.5.1"
 #define VERSION_TAG TAG " " VERSION
 #define MAX_SCAN_NETWORKS 100
 #define MAX_SAVED_NETWORKS 25

flip_wifi/update/update.c

@@ -96,7 +96,7 @@ static bool update_save_rtc_time(DateTime *rtc_time)
 }
 
 //
-// Returns true if time_current is one hour (or more) later than the stored last_updated time
+// Returns true if time_current is one hour (or more) later than the stored last_checked time
 //
 static bool update_is_update_time(DateTime *time_current)
 {
@@ -105,14 +105,14 @@ static bool update_is_update_time(DateTime *time_current)
         FURI_LOG_E(TAG, "time_current is NULL");
         return false;
     }
-    char last_updated_old[128];
-    if (!load_char("last_updated", last_updated_old, sizeof(last_updated_old)))
+    char last_checked_old[128];
+    if (!load_char("last_checked", last_checked_old, sizeof(last_checked_old)))
     {
-        FURI_LOG_E(TAG, "Failed to load last_updated");
+        FURI_LOG_E(TAG, "Failed to load last_checked");
         FuriString *json = update_datetime_to_json(time_current);
         if (json)
         {
-            save_char("last_updated", furi_string_get_cstr(json));
+            save_char("last_checked", furi_string_get_cstr(json));
             furi_string_free(json);
         }
         return false;
@@ -120,7 +120,7 @@ static bool update_is_update_time(DateTime *time_current)
 
     DateTime last_updated_time;
 
-    FuriString *last_updated_furi = char_to_furi_string(last_updated_old);
+    FuriString *last_updated_furi = char_to_furi_string(last_checked_old);
     if (!last_updated_furi)
     {
         FURI_LOG_E(TAG, "Failed to convert char to FuriString");
@@ -169,31 +169,71 @@ static bool update_last_app_update(FlipperHTTP *fhttp, bool flipper_server)
     {
         // make sure folder is created
         char directory_path[256];
-        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/flip_store");
+        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/%s", APP_ID);
 
         // Create the directory
         Storage *storage = furi_record_open(RECORD_STORAGE);
         storage_common_mkdir(storage, directory_path);
-        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/flip_store/data");
+        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/%s/data", APP_ID);
         storage_common_mkdir(storage, directory_path);
-        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/flip_store/data/last_update_request.txt");
+        snprintf(directory_path, sizeof(directory_path), STORAGE_EXT_PATH_PREFIX "/apps_data/%s/data/last_update_request.txt", APP_ID);
         storage_simply_remove_recursive(storage, directory_path); // ensure the file is empty
         furi_record_close(RECORD_STORAGE);
 
-        fhttp->save_received_data = true;
-        fhttp->is_bytes_request = false;
+        fhttp->save_received_data = false;
+        fhttp->is_bytes_request = true;
 
-        snprintf(fhttp->file_path, sizeof(fhttp->file_path), STORAGE_EXT_PATH_PREFIX "/apps_data/flip_store/data/last_update_request.txt");
-        snprintf(url, sizeof(url), "https://catalog.flipperzero.one/api/v0/0/application/%s?is_latest_release_version=true", BUILD_ID);
-        return flipper_http_request(fhttp, GET, url, "{\"Content-Type\":\"application/json\"}", NULL);
+        snprintf(fhttp->file_path, sizeof(fhttp->file_path), STORAGE_EXT_PATH_PREFIX "/apps_data/%s/data/last_update_request.txt", APP_ID);
+        snprintf(url, sizeof(url), "https://raw.githubusercontent.com/flipperdevices/flipper-application-catalog/main/applications/%s/%s/manifest.yml", APP_FOLDER, FAP_ID);
+        return flipper_http_request(fhttp, BYTES, url, "{\"Content-Type\":\"application/json\"}", NULL);
     }
     else
     {
-        snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/app/last-updated/flip_downloader/");
+        snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/app/last-updated/%s/", FAP_ID);
         return flipper_http_request(fhttp, GET, url, "{\"Content-Type\":\"application/json\"}", NULL);
     }
 }
 
+static bool parse_yaml_version(const char *yaml, char *out_version, size_t out_len)
+{
+    const char *p = strstr(yaml, "\nversion:");
+    if (!p)
+    {
+        // maybe it's the very first line
+        p = yaml;
+    }
+    else
+    {
+        // skip the “\n”
+        p++;
+    }
+    // skip the key name and colon
+    p = strstr(p, "version");
+    if (!p)
+        return false;
+    p += strlen("version");
+    // skip whitespace and colon
+    while (*p == ' ' || *p == ':')
+        p++;
+    // handle optional quote
+    bool quoted = (*p == '"');
+    if (quoted)
+        p++;
+    // copy up until end‐quote or newline/space
+    size_t i = 0;
+    while (*p && i + 1 < out_len)
+    {
+        if ((quoted && *p == '"') ||
+            (!quoted && (*p == '\n' || *p == ' ')))
+        {
+            break;
+        }
+        out_version[i++] = *p++;
+    }
+    out_version[i] = '\0';
+    return (i > 0);
+}
+
 // Parses the server response and returns true if an update is available.
 static bool update_parse_last_app_update(FlipperHTTP *fhttp, DateTime *time_current, bool flipper_server)
 {
@@ -232,34 +272,20 @@ static bool update_parse_last_app_update(FlipperHTTP *fhttp, DateTime *time_curr
     }
     else
     {
-        FuriString *app_data = flipper_http_load_from_file_with_limit(fhttp->file_path, memmgr_heap_get_max_free_block());
-        if (!app_data)
+        FuriString *manifest_data = flipper_http_load_from_file(fhttp->file_path);
+        if (!manifest_data)
         {
             FURI_LOG_E(TAG, "Failed to load app data");
             return false;
         }
-        FuriString *current_version = get_json_value_furi("current_version", app_data);
-        if (!current_version)
-        {
-            FURI_LOG_E(TAG, "Failed to get current version");
-            furi_string_free(app_data);
-            return false;
-        }
-        furi_string_free(app_data);
-        FuriString *version = get_json_value_furi("version", current_version);
-        if (!version)
+        // parse version out of the YAML
+        if (!parse_yaml_version(furi_string_get_cstr(manifest_data), version_str, sizeof(version_str)))
         {
-            FURI_LOG_E(TAG, "Failed to get version");
-            furi_string_free(current_version);
-            furi_string_free(app_data);
+            FURI_LOG_E(TAG, "Failed to parse version from YAML manifest");
             return false;
         }
-        // Save the server app version: it should save something like: 0.8
-        save_char("server_app_version", furi_string_get_cstr(version));
-        snprintf(version_str, sizeof(version_str), "%s", furi_string_get_cstr(version));
-        furi_string_free(current_version);
-        furi_string_free(version);
-        // furi_string_free(app_data);
+        save_char("server_app_version", version_str);
+        furi_string_free(manifest_data);
     }
     // Only check for an update if an hour or more has passed.
     if (update_is_update_time(time_current))
@@ -270,8 +296,6 @@ static bool update_parse_last_app_update(FlipperHTTP *fhttp, DateTime *time_curr
             FURI_LOG_E(TAG, "Failed to load app version");
             return false;
         }
-        FURI_LOG_I(TAG, "App version: %s", app_version);
-        FURI_LOG_I(TAG, "Server version: %s", version_str);
         // Check if the app version is different from the server version.
         if (!update_is_str(app_version, version_str))
         {
@@ -299,17 +323,21 @@ static bool update_get_fap_file(FlipperHTTP *fhttp, bool flipper_server)
     snprintf(
         fhttp->file_path,
         sizeof(fhttp->file_path),
-        STORAGE_EXT_PATH_PREFIX "/apps/GPIO/flip_downloader.fap");
+        STORAGE_EXT_PATH_PREFIX "/apps/%s/%s.fap", APP_FOLDER, FAP_ID);
 #else
-    snprintf(
-        fhttp->file_path,
-        sizeof(fhttp->file_path),
-        STORAGE_EXT_PATH_PREFIX "/apps/GPIO/FlipperHTTP/flip_downloader.fap");
+    if (strlen(MOM_FOLDER) == 0)
+        snprintf(
+            fhttp->file_path,
+            sizeof(fhttp->file_path),
+            STORAGE_EXT_PATH_PREFIX "/apps/%s/%s.fap", APP_FOLDER, FAP_ID);
+    else
+        snprintf(
+            fhttp->file_path,
+            sizeof(fhttp->file_path),
+            STORAGE_EXT_PATH_PREFIX "/apps/%s/%s/%s.fap", APP_FOLDER, MOM_FOLDER, FAP_ID);
 #endif
     if (flipper_server)
     {
-        char build_id[32];
-        snprintf(build_id, sizeof(build_id), "%s", BUILD_ID);
         uint8_t target;
         target = furi_hal_version_get_hw_target();
         uint16_t api_major, api_minor;
@@ -318,14 +346,14 @@ static bool update_get_fap_file(FlipperHTTP *fhttp, bool flipper_server)
             url,
             sizeof(url),
             "https://catalog.flipperzero.one/api/v0/application/version/%s/build/compatible?target=f%d&api=%d.%d",
-            build_id,
+            BUILD_ID,
             target,
             api_major,
             api_minor);
     }
     else
     {
-        snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/app/download/flip_downloader/");
+        snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/app/download/%s/", FAP_ID);
     }
     return flipper_http_request(fhttp, BYTES, url, "{\"Content-Type\": \"application/octet-stream\"}", NULL);
 }
@@ -406,8 +434,7 @@ bool update_is_ready(FlipperHTTP *fhttp, bool use_flipper_api)
         {
             if (!update_update_app(fhttp, &rtc_time, use_flipper_api))
             {
-                FURI_LOG_E(TAG, "Failed to update app");
-                // save the current time for the next check.
+                // save the last_checked for the next check.
                 if (!update_save_rtc_time(&rtc_time))
                 {
                     FURI_LOG_E(TAG, "Failed to save RTC time");

flip_wifi/update/update.h

@@ -1,4 +1,8 @@
 #pragma once
 #include <flip_wifi.h>
 #define BUILD_ID "67290f9eb81fc7da553f5f81"
+#define APP_ID "flip_wifi"
+#define FAP_ID "flip_wifi"
+#define APP_FOLDER "GPIO"
+#define MOM_FOLDER "FlipperHTTP"
 bool update_is_ready(FlipperHTTP *fhttp, bool use_flipper_api);