[XAM] Implemented backend profile settings support

Author: AdrianCassar

src/xenia/app/gamerpic_browser.cc

@@ -926,6 +926,19 @@ void TitleGamerpicBrowser::UpdateGamerpicIfRequested(
       }
 
       if (updated) {
+        // XUIDs -> Title IDs -> Settings
+        user_settingids_map settings = {};
+
+        settings[profile_->GetOnlineXUID()][xe::kernel::kDashboardID].push_back(
+            kernel::xam::UserSettingId::XPROFILE_GAMERCARD_PICTURE_KEY);
+
+        // Profile settings are sent along with profile registration, therefore
+        // it doesn't matter if this fails due to profile not existing on the
+        // backend.
+        if (!kernel::XLiveAPI::SetUsersSettings(settings)) {
+          XELOGW("Updating Backend Gamerpic Setting Failed!");
+        }
+
         new_gamerpic_ = {};
         small_gamerpic_ = {};
 

src/xenia/app/profile_dialogs.cc

@@ -115,23 +115,39 @@ void ProfileConfigDialog::LoadProfileIcon(const uint64_t xuid) {
     return;
   }
 
-  const auto profile_manager = emulator_window_->emulator()
-                                   ->kernel_state()
-                                   ->xam_state()
-                                   ->profile_manager();
+  const auto xam_state =
+      emulator_window_->emulator()->kernel_state()->xam_state();
+
+  const auto profile_manager = xam_state->profile_manager();
+  const auto user_tracker = xam_state->user_tracker();
+
   if (!profile_manager) {
     return;
   }
 
+  if (!user_tracker) {
+    return;
+  }
+
   const auto profile = profile_manager->GetProfile(xuid);
 
   if (!profile) {
     if (profile_icon_.contains(xuid)) {
       profile_icon_[xuid].release();
     }
+
+    if (profile_gamerpic_key_.contains(xuid)) {
+      profile_gamerpic_key_.erase(xuid);
+    }
     return;
   }
 
+  const auto gamerpic_key = user_tracker->GetUserGamerpicSetting(xuid);
+
+  if (gamerpic_key.has_value()) {
+    profile_gamerpic_key_[xuid] = gamerpic_key.value();
+  }
+
   const auto profile_icon =
       profile->GetProfileIcon(kernel::xam::XTileType::kGamerTile);
   if (profile_icon.empty()) {
@@ -197,12 +213,32 @@ void ProfileConfigDialog::OnDraw(ImGuiIO& io) {
     const uint8_t user_index =
         profile_manager->GetUserIndexAssignedToProfile(xuid);
 
-    // Create ImmediateTexture of profile gamerpic every frame (Slow
-    // Performance)
+    // Detect the change because creating ImmediateTexture every frame will
+    // impact performance.
     //
     // If dialog is open while Gamerpic Browser changes gamerpic then we want to
     // detect the change.
-    LoadProfileIcon(xuid);
+    const auto user_tracker = emulator_window_->emulator()
+                                  ->kernel_state()
+                                  ->xam_state()
+                                  ->user_tracker();
+
+    if (user_tracker && profile_gamerpic_key_.contains(xuid)) {
+      const auto gamerpic_key = user_tracker->GetUserGamerpicSetting(xuid);
+
+      if (gamerpic_key.has_value()) {
+        const kernel::xam::GamerPictureKey cached_gamerpic_key =
+            profile_gamerpic_key_.at(xuid);
+        const kernel::xam::GamerPictureKey current_gamerpic_key =
+            gamerpic_key.value();
+
+        // Reload gamerpic icon if changed.
+        if (memcmp(&cached_gamerpic_key, &current_gamerpic_key,
+                   sizeof(kernel::xam::GamerPictureKey)) != 0) {
+          LoadProfileIcon(xuid);
+        }
+      }
+    }
 
     const auto profile_icon = profile_icon_.find(xuid) != profile_icon_.cend()
                                   ? profile_icon_[xuid].get()
@@ -385,20 +421,10 @@ void ManagerDialog::Initalize(ui::ImGuiDrawer* imgui_drawer,
     return;
   }
 
-  friends_presence_ = RefreshFriendsPresence(profile);
-}
-
-std::future<std::vector<kernel::FriendPresenceObjectJSON>>
-ManagerDialog::RefreshFriendsPresence(xe::kernel::xam::UserProfile* profile) {
-  return std::async(std::launch::async, [profile, this]() {
-    const uint8_t user_index =
-        emulator_window_->emulator()
-            ->kernel_state()
-            ->xam_state()
-            ->GetUserIndexAssignedToProfileFromXUID(profile->xuid());
-
-    return kernel::XLiveAPI::GetAllFriendsPresence(user_index);
-  });
+  friends_presence_ =
+      kernel::XLiveAPI::GetFriendsPresenceAsync(profile->xuid());
+  immediate_gamerpics_ =
+      kernel::XLiveAPI::GetFriendsGamerpicsAsync(profile->xuid(), imgui_drawer);
 }
 
 void ManagerDialog::OnDraw(ImGuiIO& io) {
@@ -503,11 +529,21 @@ void ManagerDialog::OnDraw(ImGuiIO& io) {
       friends_presence_result_ = {};
       friends_args.refresh_presence = false;
 
-      friends_presence_ = RefreshFriendsPresence(profile);
+      friends_presence_ =
+          kernel::XLiveAPI::GetFriendsPresenceAsync(profile->xuid());
+      immediate_gamerpics_ = kernel::XLiveAPI::GetFriendsGamerpicsAsync(
+          profile->xuid(), imgui_drawer());
+    }
+
+    if (immediate_gamerpics_.valid()) {
+      if (immediate_gamerpics_.wait_for(0s) == std::future_status::ready) {
+        immediate_gamerpics_result_.merge(immediate_gamerpics_.get());
+      }
     }
 
     xeDrawFriendsContent(imgui_drawer(), profile, friends_args,
-                         &friends_presence_result_);
+                         &friends_presence_result_,
+                         immediate_gamerpics_result_);
 
     xeDrawSessionsContent(imgui_drawer(), profile, sessions_args, &sessions);
 

src/xenia/app/profile_dialogs.h

@@ -18,6 +18,7 @@
 #include "xenia/kernel/xam/user_profile.h"
 #include "xenia/ui/imgui_dialog.h"
 #include "xenia/ui/imgui_drawer.h"
+#include "xenia/ui/immediate_drawer.h"
 #include "xenia/xbox.h"
 
 namespace xe {
@@ -53,6 +54,7 @@ class ProfileConfigDialog final : public ui::ImGuiDialog {
   void LoadProfileIcon(const uint64_t xuid);
 
   std::map<uint64_t, std::unique_ptr<ui::ImmediateTexture>> profile_icon_;
+  std::map<uint64_t, kernel::xam::GamerPictureKey> profile_gamerpic_key_;
 
   uint64_t selected_xuid_ = 0;
   EmulatorWindow* emulator_window_;
@@ -69,9 +71,6 @@ class ManagerDialog final : public ui::ImGuiDialog {
   void OnDraw(ImGuiIO& io) override;
   void Initalize(ui::ImGuiDrawer* imgui_drawer, uint32_t user_index);
 
-  std::future<std::vector<kernel::FriendPresenceObjectJSON>>
-  RefreshFriendsPresence(xe::kernel::xam::UserProfile* profile);
-
  private:
   bool manager_opened_ = false;
   uint64_t selected_xuid_ = 0;
@@ -86,6 +85,10 @@ class ManagerDialog final : public ui::ImGuiDialog {
   std::future<std::vector<xe::kernel::FriendPresenceObjectJSON>>
       friends_presence_;
   std::vector<xe::kernel::FriendPresenceObjectJSON> friends_presence_result_;
+  std::future<std::map<uint64_t, std::shared_ptr<xe::ui::ImmediateTexture>>>
+      immediate_gamerpics_;
+  std::map<uint64_t, std::shared_ptr<xe::ui::ImmediateTexture>>
+      immediate_gamerpics_result_;
 };
 
 }  // namespace app