Просмотр исходного кода

rename other allocs to alloc_xxx

jblanked 9 месяцев назад
Родитель
Сommit
3bb8291441
8 измененных файлов с 48 добавлено и 48 удалено
  1. 14 14
      alloc/alloc.c
  2. 7 7
      alloc/alloc.h
  3. 1 1
      app.c
  4. 18 18
      callback/callback.c
  5. 2 2
      explore/explore.c
  6. 2 2
      feed/feed.c
  7. 1 1
      friends/friends.c
  8. 3 3
      messages/messages.c

+ 14 - 14
alloc/alloc.c

@@ -2,7 +2,7 @@
 #include <flip_storage/flip_social_storage.h>
 #include <flip_storage/flip_social_storage.h>
 #include <feed/feed.h>
 #include <feed/feed.h>
 
 
-FlipSocialApp *flip_social_app_alloc()
+FlipSocialApp *alloc_flip_social_app()
 {
 {
     // Initiailize the app
     // Initiailize the app
     FlipSocialApp *app = (FlipSocialApp *)malloc(sizeof(FlipSocialApp));
     FlipSocialApp *app = (FlipSocialApp *)malloc(sizeof(FlipSocialApp));
@@ -368,7 +368,7 @@ FlipSocialApp *flip_social_app_alloc()
             app->wifi_ssid_logged_out_temp_buffer[app->wifi_ssid_logged_in_temp_buffer_size - 1] = '\0';
             app->wifi_ssid_logged_out_temp_buffer[app->wifi_ssid_logged_in_temp_buffer_size - 1] = '\0';
         }
         }
 
 
-        auth_headers_alloc();
+        alloc_headers();
 
 
         if (app->is_logged_in != NULL && strcmp(app->is_logged_in, "true") == 0)
         if (app->is_logged_in != NULL && strcmp(app->is_logged_in, "true") == 0)
         {
         {
@@ -433,7 +433,7 @@ FlipSocialModel *alloc_explore(void)
     return explore;
     return explore;
 }
 }
 
 
-void auth_headers_alloc(void)
+void alloc_headers(void)
 {
 {
     if (!app_instance)
     if (!app_instance)
     {
     {
@@ -455,7 +455,7 @@ void auth_headers_alloc(void)
     }
     }
 }
 }
 
 
-FlipSocialFeedMini *flip_feed_info_alloc(void)
+FlipSocialFeedMini *alloc_feed_info(void)
 {
 {
     FlipSocialFeedMini *feed_info = (FlipSocialFeedMini *)malloc(sizeof(FlipSocialFeedMini));
     FlipSocialFeedMini *feed_info = (FlipSocialFeedMini *)malloc(sizeof(FlipSocialFeedMini));
     if (!feed_info)
     if (!feed_info)
@@ -467,7 +467,7 @@ FlipSocialFeedMini *flip_feed_info_alloc(void)
     feed_info->index = 0;
     feed_info->index = 0;
     return feed_info;
     return feed_info;
 }
 }
-bool messages_dialog_alloc(bool free_first)
+bool allow_messages_dialog(bool free_first)
 {
 {
     if (free_first)
     if (free_first)
     {
     {
@@ -481,7 +481,7 @@ bool messages_dialog_alloc(bool free_first)
                 flip_social_messages->usernames[flip_social_messages->index],
                 flip_social_messages->usernames[flip_social_messages->index],
                 0,
                 0,
                 0,
                 0,
-                updated_user_message(flip_social_messages->messages[flip_social_messages->index]),
+                alloc_format_message(flip_social_messages->messages[flip_social_messages->index]),
                 0,
                 0,
                 10,
                 10,
                 flip_social_messages->index != 0 ? "Prev" : NULL,
                 flip_social_messages->index != 0 ? "Prev" : NULL,
@@ -498,7 +498,7 @@ bool messages_dialog_alloc(bool free_first)
     }
     }
     return false;
     return false;
 }
 }
-char *updated_user_message(const char *user_message)
+char *alloc_format_message(const char *user_message)
 {
 {
     if (user_message == NULL)
     if (user_message == NULL)
     {
     {
@@ -807,7 +807,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
             FURI_LOG_E(TAG, "Failed to load nexy feed post");
             FURI_LOG_E(TAG, "Failed to load nexy feed post");
             return false;
             return false;
         }
         }
-        if (feed_view_alloc())
+        if (alloc_feed_view())
         {
         {
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
         }
         }
@@ -852,7 +852,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
                 FURI_LOG_E(TAG, "Failed to load nexy feed post");
                 FURI_LOG_E(TAG, "Failed to load nexy feed post");
                 return false;
                 return false;
             }
             }
-            if (feed_view_alloc())
+            if (alloc_feed_view())
             {
             {
                 view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
                 view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
             }
             }
@@ -875,7 +875,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
             FURI_LOG_E(TAG, "Failed to load nexy feed post");
             FURI_LOG_E(TAG, "Failed to load nexy feed post");
             return false;
             return false;
         }
         }
-        if (feed_view_alloc())
+        if (alloc_feed_view())
         {
         {
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
         }
         }
@@ -914,7 +914,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
             FURI_LOG_E(TAG, "Failed to initialize FlipperHTTP");
             FURI_LOG_E(TAG, "Failed to initialize FlipperHTTP");
             return false;
             return false;
         }
         }
-        auth_headers_alloc();
+        alloc_headers();
         char payload[256];
         char payload[256];
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"post_id\":\"%u\"}", app_instance->login_username_logged_in, flip_feed_item->id);
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"post_id\":\"%u\"}", app_instance->login_username_logged_in, flip_feed_item->id);
         if (flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/feed/flip/", auth_headers, payload))
         if (flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/feed/flip/", auth_headers, payload))
@@ -943,7 +943,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
             flipper_http_free(fhttp);
             flipper_http_free(fhttp);
             return false;
             return false;
         }
         }
-        if (feed_view_alloc())
+        if (alloc_feed_view())
         {
         {
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
             view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInFeed);
         }
         }
@@ -956,7 +956,7 @@ static bool flip_social_feed_input_callback(InputEvent *event, void *context)
     return false;
     return false;
 }
 }
 
 
-bool feed_view_alloc()
+bool alloc_feed_view()
 {
 {
     if (!app_instance)
     if (!app_instance)
     {
     {
@@ -1115,7 +1115,7 @@ bool alloc_text_input(uint32_t view_id)
     return true;
     return true;
 }
 }
 
 
-bool about_widget_alloc(bool is_logged_in)
+bool alloc_about_widget(bool is_logged_in)
 {
 {
     if (!is_logged_in)
     if (!is_logged_in)
     {
     {

+ 7 - 7
alloc/alloc.h

@@ -2,17 +2,17 @@
 #include <flip_social.h>
 #include <flip_social.h>
 #include <callback/callback.h>
 #include <callback/callback.h>
 #include <free/free.h>
 #include <free/free.h>
-FlipSocialApp *flip_social_app_alloc();
+FlipSocialApp *alloc_flip_social_app();
 FlipSocialModel *alloc_friends_model();
 FlipSocialModel *alloc_friends_model();
 FlipSocialModel2 *alloc_messages();
 FlipSocialModel2 *alloc_messages();
 FlipSocialMessage *alloc_user_messages();
 FlipSocialMessage *alloc_user_messages();
 FlipSocialModel *alloc_explore();
 FlipSocialModel *alloc_explore();
-void auth_headers_alloc(void);
-FlipSocialFeedMini *flip_feed_info_alloc(void);
-bool messages_dialog_alloc(bool free_first);
-bool feed_view_alloc();
-char *updated_user_message(const char *user_message);
+void alloc_headers(void);
+FlipSocialFeedMini *alloc_feed_info(void);
+bool allow_messages_dialog(bool free_first);
+bool alloc_feed_view();
+char *alloc_format_message(const char *user_message);
 bool alloc_text_input(uint32_t view_id);
 bool alloc_text_input(uint32_t view_id);
-bool about_widget_alloc(bool is_logged_in);
+bool alloc_about_widget(bool is_logged_in);
 bool alloc_variable_item_list(uint32_t view_id);
 bool alloc_variable_item_list(uint32_t view_id);
 bool alloc_submenu(uint32_t view_id);
 bool alloc_submenu(uint32_t view_id);

+ 1 - 1
app.c

@@ -13,7 +13,7 @@ int32_t main_flip_social(void *p)
     UNUSED(p);
     UNUSED(p);
 
 
     // Initialize the Hello World application
     // Initialize the Hello World application
-    app_instance = flip_social_app_alloc();
+    app_instance = alloc_flip_social_app();
     if (!app_instance)
     if (!app_instance)
     {
     {
         // Allocation failed
         // Allocation failed

+ 18 - 18
callback/callback.c

@@ -27,7 +27,7 @@ static bool flip_social_login_fetch(DataLoaderModel *model)
     }
     }
     char buffer[256];
     char buffer[256];
     snprintf(buffer, sizeof(buffer), "{\"username\":\"%s\",\"password\":\"%s\"}", app_instance->login_username_logged_out, app_instance->login_password_logged_out);
     snprintf(buffer, sizeof(buffer), "{\"username\":\"%s\",\"password\":\"%s\"}", app_instance->login_username_logged_out, app_instance->login_password_logged_out);
-    auth_headers_alloc();
+    alloc_headers();
     return flipper_http_request(model->fhttp, POST, "https://www.jblanked.com/flipper/api/user/login/", auth_headers, buffer);
     return flipper_http_request(model->fhttp, POST, "https://www.jblanked.com/flipper/api/user/login/", auth_headers, buffer);
 }
 }
 
 
@@ -147,7 +147,7 @@ static char *flip_social_register_parse(DataLoaderModel *model)
         app_instance->is_logged_in = "true";
         app_instance->is_logged_in = "true";
 
 
         // update header credentials
         // update header credentials
-        auth_headers_alloc();
+        alloc_headers();
 
 
         // save the credentials
         // save the credentials
         save_settings(app_instance->wifi_ssid_logged_out, app_instance->wifi_password_logged_out, app_instance->login_username_logged_out, app_instance->login_username_logged_in, app_instance->login_password_logged_out, app_instance->change_password_logged_in, app_instance->change_bio_logged_in, app_instance->is_logged_in);
         save_settings(app_instance->wifi_ssid_logged_out, app_instance->wifi_password_logged_out, app_instance->login_username_logged_out, app_instance->login_username_logged_in, app_instance->login_password_logged_out, app_instance->change_password_logged_in, app_instance->change_bio_logged_in, app_instance->is_logged_in);
@@ -380,7 +380,7 @@ void explore_dialog_callback(DialogExResult result, void *context)
             // remove friend
             // remove friend
             char remove_payload[128];
             char remove_payload[128];
             snprintf(remove_payload, sizeof(remove_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_explore->usernames[flip_social_explore->index]);
             snprintf(remove_payload, sizeof(remove_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_explore->usernames[flip_social_explore->index]);
-            auth_headers_alloc();
+            alloc_headers();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             free_explore_dialog();
             free_explore_dialog();
@@ -396,7 +396,7 @@ void explore_dialog_callback(DialogExResult result, void *context)
             // add friend
             // add friend
             char add_payload[128];
             char add_payload[128];
             snprintf(add_payload, sizeof(add_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_explore->usernames[flip_social_explore->index]);
             snprintf(add_payload, sizeof(add_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_explore->usernames[flip_social_explore->index]);
-            auth_headers_alloc();
+            alloc_headers();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/add-friend/", auth_headers, add_payload);
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/add-friend/", auth_headers, add_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             free_explore_dialog();
             free_explore_dialog();
@@ -417,7 +417,7 @@ static void friends_dialog_callback(DialogExResult result, void *context)
             // remove friend
             // remove friend
             char remove_payload[128];
             char remove_payload[128];
             snprintf(remove_payload, sizeof(remove_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_friends->usernames[flip_social_friends->index]);
             snprintf(remove_payload, sizeof(remove_payload), "{\"username\":\"%s\",\"friend\":\"%s\"}", app_instance->login_username_logged_in, flip_social_friends->usernames[flip_social_friends->index]);
-            auth_headers_alloc();
+            alloc_headers();
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/remove-friend/", auth_headers, remove_payload);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewSubmenu);
             free_friends_dialog();
             free_friends_dialog();
@@ -437,7 +437,7 @@ void callback_message_dialog(DialogExResult result, void *context)
             flip_social_messages->index--;
             flip_social_messages->index--;
             dialog_ex_reset(app->dialog_messages);
             dialog_ex_reset(app->dialog_messages);
             dialog_ex_set_header(app->dialog_messages, flip_social_messages->usernames[flip_social_messages->index], 0, 0, AlignLeft, AlignTop);
             dialog_ex_set_header(app->dialog_messages, flip_social_messages->usernames[flip_social_messages->index], 0, 0, AlignLeft, AlignTop);
-            dialog_ex_set_text(app->dialog_messages, updated_user_message(flip_social_messages->messages[flip_social_messages->index]), 0, 10, AlignLeft, AlignTop);
+            dialog_ex_set_text(app->dialog_messages, alloc_format_message(flip_social_messages->messages[flip_social_messages->index]), 0, 10, AlignLeft, AlignTop);
             if (flip_social_messages->index != 0)
             if (flip_social_messages->index != 0)
             {
             {
                 dialog_ex_set_left_button_text(app->dialog_messages, "Prev");
                 dialog_ex_set_left_button_text(app->dialog_messages, "Prev");
@@ -447,7 +447,7 @@ void callback_message_dialog(DialogExResult result, void *context)
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
             free_messages_dialog();
             free_messages_dialog();
-            messages_dialog_alloc(false);
+            allow_messages_dialog(false);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
         }
         }
     }
     }
@@ -458,7 +458,7 @@ void callback_message_dialog(DialogExResult result, void *context)
             flip_social_messages->index++;
             flip_social_messages->index++;
             dialog_ex_reset(app->dialog_messages);
             dialog_ex_reset(app->dialog_messages);
             dialog_ex_set_header(app->dialog_messages, flip_social_messages->usernames[flip_social_messages->index], 0, 0, AlignLeft, AlignTop);
             dialog_ex_set_header(app->dialog_messages, flip_social_messages->usernames[flip_social_messages->index], 0, 0, AlignLeft, AlignTop);
-            dialog_ex_set_text(app->dialog_messages, updated_user_message(flip_social_messages->messages[flip_social_messages->index]), 0, 10, AlignLeft, AlignTop);
+            dialog_ex_set_text(app->dialog_messages, alloc_format_message(flip_social_messages->messages[flip_social_messages->index]), 0, 10, AlignLeft, AlignTop);
             dialog_ex_set_left_button_text(app->dialog_messages, "Prev");
             dialog_ex_set_left_button_text(app->dialog_messages, "Prev");
             if (flip_social_messages->index != flip_social_messages->count - 1)
             if (flip_social_messages->index != flip_social_messages->count - 1)
             {
             {
@@ -468,7 +468,7 @@ void callback_message_dialog(DialogExResult result, void *context)
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             // switch view, free dialog, re-alloc dialog, switch back to dialog
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewWidgetResult);
             free_messages_dialog();
             free_messages_dialog();
-            messages_dialog_alloc(false);
+            allow_messages_dialog(false);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewMessagesDialog);
         }
         }
     }
     }
@@ -690,7 +690,7 @@ void callback_submenu_choices(void *context, uint32_t index)
         view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewVariableItemList);
         view_dispatcher_switch_to_view(app->view_dispatcher, FlipSocialViewVariableItemList);
         break;
         break;
     case FlipSocialSubmenuLoggedOutIndexAbout:
     case FlipSocialSubmenuLoggedOutIndexAbout:
-        if (!about_widget_alloc(false))
+        if (!alloc_about_widget(false))
         {
         {
             return;
             return;
         }
         }
@@ -782,7 +782,7 @@ void callback_submenu_choices(void *context, uint32_t index)
         break;
         break;
     case FlipSocialSubmenuLoggedInIndexAbout:
     case FlipSocialSubmenuLoggedInIndexAbout:
         free_all(true, false, context);
         free_all(true, false, context);
-        if (!about_widget_alloc(true))
+        if (!alloc_about_widget(true))
         {
         {
             FURI_LOG_E(TAG, "Failed to allocate about widget");
             FURI_LOG_E(TAG, "Failed to allocate about widget");
             return;
             return;
@@ -844,7 +844,7 @@ void callback_submenu_choices(void *context, uint32_t index)
                         "New Feed Post",
                         "New Feed Post",
                         0,
                         0,
                         0,
                         0,
-                        updated_user_message(selected_message),
+                        alloc_format_message(selected_message),
                         0,
                         0,
                         10,
                         10,
                         "Delete",
                         "Delete",
@@ -891,7 +891,7 @@ void callback_submenu_choices(void *context, uint32_t index)
             //                 flip_social_explore->usernames[flip_social_explore->index],
             //                 flip_social_explore->usernames[flip_social_explore->index],
             //                 0,
             //                 0,
             //                 0,
             //                 0,
-            //                 updated_user_message(app->explore_user_bio),
+            //                 alloc_format_message(app->explore_user_bio),
             //                 0,
             //                 0,
             //                 10,
             //                 10,
             //                 "Remove", // remove if user is a friend (future update)
             //                 "Remove", // remove if user is a friend (future update)
@@ -1683,7 +1683,7 @@ void callback_logged_in_profile_change_password_updated(void *context)
     FlipperHTTP *fhttp = flipper_http_alloc();
     FlipperHTTP *fhttp = flipper_http_alloc();
     if (fhttp)
     if (fhttp)
     {
     {
-        auth_headers_alloc();
+        alloc_headers();
         char payload[256];
         char payload[256];
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"old_password\":\"%s\",\"new_password\":\"%s\"}", app->login_username_logged_out, old_password, app->change_password_logged_in);
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"old_password\":\"%s\",\"new_password\":\"%s\"}", app->login_username_logged_out, old_password, app->change_password_logged_in);
         if (!flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/change-password/", auth_headers, payload))
         if (!flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/change-password/", auth_headers, payload))
@@ -1725,7 +1725,7 @@ void callback_logged_in_profile_change_bio_updated(void *context)
     FlipperHTTP *fhttp = flipper_http_alloc();
     FlipperHTTP *fhttp = flipper_http_alloc();
     if (fhttp)
     if (fhttp)
     {
     {
-        auth_headers_alloc();
+        alloc_headers();
         char payload[256];
         char payload[256];
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"bio\":\"%s\"}", app->login_username_logged_out, app->change_bio_logged_in);
         snprintf(payload, sizeof(payload), "{\"username\":\"%s\",\"bio\":\"%s\"}", app->login_username_logged_out, app->change_bio_logged_in);
         if (!flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/change-bio/", auth_headers, payload))
         if (!flipper_http_request(fhttp, POST, "https://www.jblanked.com/flipper/api/user/change-bio/", auth_headers, payload))
@@ -1842,7 +1842,7 @@ void callback_logged_in_messages_user_choice_message_updated(void *context)
         FURI_LOG_E(TAG, "Failed to initialize HTTP");
         FURI_LOG_E(TAG, "Failed to initialize HTTP");
         return;
         return;
     }
     }
-    auth_headers_alloc();
+    alloc_headers();
     char url[128];
     char url[128];
     char payload[256];
     char payload[256];
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/messages/%s/post/", app->login_username_logged_in);
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/messages/%s/post/", app->login_username_logged_in);
@@ -1920,7 +1920,7 @@ void callback_logged_in_messages_new_message_updated(void *context)
     bool send_message_to_user()
     bool send_message_to_user()
     {
     {
         // send post request to send message
         // send post request to send message
-        auth_headers_alloc();
+        alloc_headers();
         char url[128];
         char url[128];
         char payload[256];
         char payload[256];
         snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/messages/%s/post/", app->login_username_logged_in);
         snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/messages/%s/post/", app->login_username_logged_in);
@@ -2057,7 +2057,7 @@ bool callback_get_home_notification(FlipperHTTP *fhttp)
     Storage *storage = furi_record_open(RECORD_STORAGE);
     Storage *storage = furi_record_open(RECORD_STORAGE);
     storage_common_mkdir(storage, directory_path);
     storage_common_mkdir(storage, directory_path);
     furi_record_close(RECORD_STORAGE);
     furi_record_close(RECORD_STORAGE);
-    auth_headers_alloc();
+    alloc_headers();
 
 
     snprintf(
     snprintf(
         fhttp->file_path,
         fhttp->file_path,

+ 2 - 2
explore/explore.c

@@ -29,7 +29,7 @@ bool explore_fetch(FlipperHTTP *fhttp)
         keyword);
         keyword);
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     char url[256];
     char url[256];
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/explore/%s/%d/", keyword, MAX_EXPLORE_USERS);
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/explore/%s/%d/", keyword, MAX_EXPLORE_USERS);
     if (!flipper_http_request(fhttp, GET, url, auth_headers, NULL))
     if (!flipper_http_request(fhttp, GET, url, auth_headers, NULL))
@@ -67,7 +67,7 @@ bool explore_fetch_2(FlipperHTTP *fhttp)
         keyword);
         keyword);
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     char url[256];
     char url[256];
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/explore/%s/%d/", keyword, MAX_EXPLORE_USERS);
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/explore/%s/%d/", keyword, MAX_EXPLORE_USERS);
     return flipper_http_request(fhttp, GET, url, auth_headers, NULL);
     return flipper_http_request(fhttp, GET, url, auth_headers, NULL);

+ 2 - 2
feed/feed.c

@@ -26,7 +26,7 @@ bool feed_fetch(FlipperHTTP *fhttp, int series_index)
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/feed.json");
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/feed.json");
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     char command[96];
     char command[96];
     if (strstr(flip_social_feed_type[flip_social_feed_type_index], "Global"))
     if (strstr(flip_social_feed_type[flip_social_feed_type_index], "Global"))
     {
     {
@@ -261,7 +261,7 @@ bool feed_load_initial_feed(FlipperHTTP *fhttp, int series_index)
         loading_free(loading);
         loading_free(loading);
         return false;
         return false;
     }
     }
-    if (!feed_view_alloc())
+    if (!alloc_feed_view())
     {
     {
         FURI_LOG_E(TAG, "Failed to allocate feed dialog");
         FURI_LOG_E(TAG, "Failed to allocate feed dialog");
         view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInSubmenu);
         view_dispatcher_switch_to_view(app_instance->view_dispatcher, FlipSocialViewLoggedInSubmenu);

+ 1 - 1
friends/friends.c

@@ -26,7 +26,7 @@ bool friends_fetch(FlipperHTTP *fhttp)
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/friends.json");
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/friends.json");
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/friends/%s/", app_instance->login_username_logged_in);
     snprintf(url, sizeof(url), "https://www.jblanked.com/flipper/api/user/friends/%s/", app_instance->login_username_logged_in);
     if (!flipper_http_request(fhttp, GET, url, auth_headers, NULL))
     if (!flipper_http_request(fhttp, GET, url, auth_headers, NULL))
     {
     {

+ 3 - 3
messages/messages.c

@@ -85,7 +85,7 @@ bool messages_get_message_users(FlipperHTTP *fhttp)
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/messages/message_users.json");
         STORAGE_EXT_PATH_PREFIX "/apps_data/flip_social/messages/message_users.json");
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     snprintf(command, 128, "https://www.jblanked.com/flipper/api/messages/%s/get/list/%d/", app_instance->login_username_logged_out, MAX_MESSAGE_USERS);
     snprintf(command, 128, "https://www.jblanked.com/flipper/api/messages/%s/get/list/%d/", app_instance->login_username_logged_out, MAX_MESSAGE_USERS);
     if (!flipper_http_request(fhttp, GET, command, auth_headers, NULL))
     if (!flipper_http_request(fhttp, GET, command, auth_headers, NULL))
     {
     {
@@ -135,7 +135,7 @@ bool messages_get_messages_with_user(FlipperHTTP *fhttp)
         flip_social_message_users->usernames[flip_social_message_users->index]);
         flip_social_message_users->usernames[flip_social_message_users->index]);
 
 
     fhttp->save_received_data = true;
     fhttp->save_received_data = true;
-    auth_headers_alloc();
+    alloc_headers();
     snprintf(command, sizeof(command), "https://www.jblanked.com/flipper/api/messages/%s/get/%s/%d/", app_instance->login_username_logged_out, flip_social_message_users->usernames[flip_social_message_users->index], MAX_MESSAGES);
     snprintf(command, sizeof(command), "https://www.jblanked.com/flipper/api/messages/%s/get/%s/%d/", app_instance->login_username_logged_out, flip_social_message_users->usernames[flip_social_message_users->index], MAX_MESSAGES);
     if (!flipper_http_request(fhttp, GET, command, auth_headers, NULL))
     if (!flipper_http_request(fhttp, GET, command, auth_headers, NULL))
     {
     {
@@ -307,7 +307,7 @@ bool messages_parse_json_messages(FlipperHTTP *fhttp)
         furi_string_free(sender);
         furi_string_free(sender);
         furi_string_free(content);
         furi_string_free(content);
     }
     }
-    if (!messages_dialog_alloc(true))
+    if (!allow_messages_dialog(true))
     {
     {
         FURI_LOG_E(TAG, "Failed to allocate and set messages dialog.");
         FURI_LOG_E(TAG, "Failed to allocate and set messages dialog.");
         furi_string_free(message_data);
         furi_string_free(message_data);