2206 GDK QFE3 (#593)

* 2206 GDK QFE3
microsoft · Sep 7, 2022 · 97a1240 · 97a1240
1 parent a4d82ba
commit 97a1240
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Include/xsapi-c/privacy_c.h b/Include/xsapi-c/privacy_c.h
@@ -363,7 +363,7 @@ enum class XblPermissionDenyReason : uint32_t
     /// A privacy value for the requestor has a restriction that doesn't allow interaction with the target.  
     /// For instance, a parental control only allows interaction with friends and the target isn't a friend.
     /// </summary>
-    PrivacySettingsRestrictsTarget = 9,
+    PrivacySettingRestrictsTarget = 9,
 
     /// <summary>
     /// The target is a cross-network user, but cross-network privacy settings indicated only friends are allowed.  
@@ -418,7 +418,7 @@ typedef struct XblPermissionDenyReasonDetails
     XblPrivilege restrictedPrivilege;
 
     /// <summary>
-    /// Active when the deny reason is XblPermissionDenyReason::PrivacySettingsRestrictsTarget.  
+    /// Active when the deny reason is XblPermissionDenyReason::PrivacySettingRestrictsTarget.  
     /// Unknown otherwise.
     /// </summary>
     XblPrivacySetting restrictedPrivacySetting;

diff --git a/Include/xsapi-cpp/impl/privacy.hpp b/Include/xsapi-cpp/impl/privacy.hpp
@@ -24,7 +24,7 @@ string_t permission_deny_reason::reason() const
         { static_cast<uint32_t>(XblPermissionDenyReason::PrivilegeRestrictsTarget), _T("PrivilegeRestrictsTarget") },
         { static_cast<uint32_t>(XblPermissionDenyReason::BlockListRestrictsTarget), _T("BlockListRestrictsTarget") },
         { static_cast<uint32_t>(XblPermissionDenyReason::MuteListRestrictsTarget), _T("MuteListRestrictsTarget") },
-        { static_cast<uint32_t>(XblPermissionDenyReason::PrivacySettingsRestrictsTarget), _T("PrivacySettingsRestrictsTarget") }
+        { static_cast<uint32_t>(XblPermissionDenyReason::PrivacySettingRestrictsTarget), _T("PrivacySettingRestrictsTarget") }
     };
     return reasonsMap.at(static_cast<uint32_t>(m_reasonDetails.reason));
 }

diff --git a/Source/Services/Privacy/permission_check_result.cpp b/Source/Services/Privacy/permission_check_result.cpp
@@ -78,7 +78,7 @@ Result<PermissionCheckResult> PermissionCheckResult::Deserialize(
                     result.restrictedPrivilege = XblPrivilegeValue(restrictedSetting.data());
                     break;
                 }
-                case XblPermissionDenyReason::PrivacySettingsRestrictsTarget:
+                case XblPermissionDenyReason::PrivacySettingRestrictsTarget:
                 {
                     result.restrictedPrivacySetting = EnumValue<XblPrivacySetting>(restrictedSetting.data());
                     break;

diff --git a/Source/Services/RealTimeActivityManager/real_time_activity_connection.cpp b/Source/Services/RealTimeActivityManager/real_time_activity_connection.cpp
@@ -691,7 +691,10 @@ void Connection::ConnectCompleteHandler(WebsocketResult result) noexcept
     }
     else
     {
-        m_state = XblRealTimeActivityConnectionState::Disconnected;
+        if (m_connectAttempt > 3)
+        {
+            m_state = XblRealTimeActivityConnectionState::Disconnected;
+        }
         ScheduleConnect();
     }
 
@@ -804,7 +807,6 @@ void Connection::DisconnectHandler(WebSocketCloseStatus status) noexcept
         serviceSub->status = ServiceSubscription::Status::Inactive;
     }
 
-    m_state = XblRealTimeActivityConnectionState::Disconnected;
     ScheduleConnect();
     lock.unlock();
 

diff --git a/Source/Shared/build_version.h b/Source/Shared/build_version.h
@@ -9,4 +9,4 @@
 //*********************************************************
 #pragma once
 
-#define XBOX_SERVICES_API_VERSION_STRING "2022.06.20220517.0"
+#define XBOX_SERVICES_API_VERSION_STRING "2022.06.20220822.3"