Remove creator function and replace with HAL include (#926)

nwhite-riot · web-flow · commit 473a92f7ceac · 2025-05-27T12:46:19.000+03:00
* Remove creator function and replace with HAL include

* Add IOS and Mac files for user

* Add file to snapshots

* Add additional files

* Fix test

* Correct test to use shareable
diff --git a/plugin-dev/Source/Sentry/Private/HAL/PlatformSentryUser.h b/plugin-dev/Source/Sentry/Private/HAL/PlatformSentryUser.h
@@ -2,17 +2,4 @@
 
 #pragma once
 
-#if PLATFORM_ANDROID
-#include "Android/AndroidSentryUser.h"
-#elif PLATFORM_APPLE
-#include "Apple/AppleSentryUser.h"
-#elif USE_SENTRY_NATIVE
-#include "GenericPlatform/GenericPlatformSentryUser.h"
-#else
-#include "Null/NullSentryUser.h"
-#endif
-
-static TSharedPtr<ISentryUser> CreateSharedSentryUser()
-{
-	return MakeShareable(new FPlatformSentryUser);
-}
+#include COMPILED_PLATFORM_HEADER(SentryUser.h)
diff --git a/plugin-dev/Source/Sentry/Private/IOS/IOSSentryUser.h b/plugin-dev/Source/Sentry/Private/IOS/IOSSentryUser.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "Apple/AppleSentryUser.h"
diff --git a/plugin-dev/Source/Sentry/Private/Linux/LinuxSentryUser.h b/plugin-dev/Source/Sentry/Private/Linux/LinuxSentryUser.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "GenericPlatform/GenericPlatformSentryUser.h"
diff --git a/plugin-dev/Source/Sentry/Private/Mac/MacSentryUser.h b/plugin-dev/Source/Sentry/Private/Mac/MacSentryUser.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "Apple/AppleSentryUser.h"
diff --git a/plugin-dev/Source/Sentry/Private/SentryLibrary.cpp b/plugin-dev/Source/Sentry/Private/SentryLibrary.cpp
@@ -29,7 +29,7 @@ USentryEvent* USentryLibrary::CreateSentryEvent(const FString& Message, ESentryL
 
 USentryUser* USentryLibrary::CreateSentryUser(const FString& Email, const FString& Id, const FString& Username, const FString& IpAddress, const TMap<FString, FString>& Data)
 {
-	USentryUser* User = USentryUser::Create(CreateSharedSentryUser());
+	USentryUser* User = USentryUser::Create(MakeShareable(new FPlatformSentryUser));
 
 	if (!Email.IsEmpty())
 		User->SetEmail(Email);
diff --git a/plugin-dev/Source/Sentry/Private/SentryUser.cpp b/plugin-dev/Source/Sentry/Private/SentryUser.cpp
@@ -6,7 +6,7 @@
 
 void USentryUser::Initialize()
 {
-	NativeImpl = CreateSharedSentryUser();
+	NativeImpl = MakeShareable(new FPlatformSentryUser);
 }
 
 void USentryUser::SetEmail(const FString& Email)
diff --git a/plugin-dev/Source/Sentry/Private/Tests/SentryUser.spec.cpp b/plugin-dev/Source/Sentry/Private/Tests/SentryUser.spec.cpp
@@ -17,7 +17,7 @@ void SentryUserSpec::Define()
 {
 	BeforeEach([this]()
 	{
-		SentryUser = USentryUser::Create(CreateSharedSentryUser());
+		SentryUser = USentryUser::Create(MakeShareable(new FPlatformSentryUser));
 	});
 
 	Describe("User params", [this]()
diff --git a/plugin-dev/Source/Sentry/Private/Windows/WindowsSentryUser.h b/plugin-dev/Source/Sentry/Private/Windows/WindowsSentryUser.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "GenericPlatform/GenericPlatformSentryUser.h"
diff --git a/scripts/packaging/package-github.snapshot b/scripts/packaging/package-github.snapshot
@@ -130,10 +130,13 @@ Source/Sentry/Private/Interface/SentryUserFeedbackInterface.h
 Source/Sentry/Private/Interface/SentryUserInterface.h
 Source/Sentry/Private/IOS/IOSSentrySubsystem.cpp
 Source/Sentry/Private/IOS/IOSSentrySubsystem.h
+Source/Sentry/Private/IOS/IOSSentryUser.h
 Source/Sentry/Private/Linux/LinuxSentrySubsystem.cpp
 Source/Sentry/Private/Linux/LinuxSentrySubsystem.h
+Source/Sentry/Private/Linux/LinuxSentryUser.h
 Source/Sentry/Private/Mac/MacSentrySubsystem.cpp
 Source/Sentry/Private/Mac/MacSentrySubsystem.h
+Source/Sentry/Private/Mac/MacSentryUser.h
 Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.cpp
 Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.h
 Source/Sentry/Private/Null/NullSentryAttachment.h
@@ -185,6 +188,7 @@ Source/Sentry/Private/Windows/Infrastructure/WindowsSentryConverters.cpp
 Source/Sentry/Private/Windows/Infrastructure/WindowsSentryConverters.h
 Source/Sentry/Private/Windows/WindowsSentrySubsystem.cpp
 Source/Sentry/Private/Windows/WindowsSentrySubsystem.h
+Source/Sentry/Private/Windows/WindowsSentryUser.h
 Source/Sentry/Public/SentryAttachment.h
 Source/Sentry/Public/SentryBeforeBreadcrumbHandler.h
 Source/Sentry/Public/SentryBeforeSendHandler.h
diff --git a/scripts/packaging/package-marketplace.snapshot b/scripts/packaging/package-marketplace.snapshot
@@ -129,10 +129,13 @@ Source/Sentry/Private/Interface/SentryUserFeedbackInterface.h
 Source/Sentry/Private/Interface/SentryUserInterface.h
 Source/Sentry/Private/IOS/IOSSentrySubsystem.cpp
 Source/Sentry/Private/IOS/IOSSentrySubsystem.h
+Source/Sentry/Private/IOS/IOSSentryUser.h
 Source/Sentry/Private/Linux/LinuxSentrySubsystem.cpp
 Source/Sentry/Private/Linux/LinuxSentrySubsystem.h
+Source/Sentry/Private/Linux/LinuxSentryUser.h
 Source/Sentry/Private/Mac/MacSentrySubsystem.cpp
 Source/Sentry/Private/Mac/MacSentrySubsystem.h
+Source/Sentry/Private/Mac/MacSentryUser.h
 Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.cpp
 Source/Sentry/Private/Microsoft/MicrosoftSentrySubsystem.h
 Source/Sentry/Private/Null/NullSentryAttachment.h
@@ -184,6 +187,7 @@ Source/Sentry/Private/Windows/Infrastructure/WindowsSentryConverters.cpp
 Source/Sentry/Private/Windows/Infrastructure/WindowsSentryConverters.h
 Source/Sentry/Private/Windows/WindowsSentrySubsystem.cpp
 Source/Sentry/Private/Windows/WindowsSentrySubsystem.h
+Source/Sentry/Private/Windows/WindowsSentryUser.h
 Source/Sentry/Public/SentryAttachment.h
 Source/Sentry/Public/SentryBeforeBreadcrumbHandler.h
 Source/Sentry/Public/SentryBeforeSendHandler.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#include "Apple/AppleSentryUser.h"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+#include "GenericPlatform/GenericPlatformSentryUser.h"`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ USentryEvent* USentryLibrary::CreateSentryEvent(const FString& Message, ESentryL`
`29`	`29`
`30`	`30`	`USentryUser* USentryLibrary::CreateSentryUser(const FString& Email, const FString& Id, const FString& Username, const FString& IpAddress, const TMap<FString, FString>& Data)`
`31`	`31`	`{`
`32`		`- USentryUser* User = USentryUser::Create(CreateSharedSentryUser());`
	`32`	`+ USentryUser* User = USentryUser::Create(MakeShareable(new FPlatformSentryUser));`
`33`	`33`
`34`	`34`	`if (!Email.IsEmpty())`
`35`	`35`	`User->SetEmail(Email);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`void USentryUser::Initialize()`
`8`	`8`	`{`
`9`		`- NativeImpl = CreateSharedSentryUser();`
	`9`	`+ NativeImpl = MakeShareable(new FPlatformSentryUser);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`void USentryUser::SetEmail(const FString& Email)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ void SentryUserSpec::Define()`
`17`	`17`	`{`
`18`	`18`	`BeforeEach([this]()`
`19`	`19`	`{`
`20`		`- SentryUser = USentryUser::Create(CreateSharedSentryUser());`
	`20`	`+ SentryUser = USentryUser::Create(MakeShareable(new FPlatformSentryUser));`
`21`	`21`	`});`
`22`	`22`
`23`	`23`	`Describe("User params", [this]()`