Fix plugin packaging errors (FAB)

plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.cpp

@@ -26,6 +26,7 @@
 #include "Utils/SentryFileUtils.h"
 
 #include "Dom/JsonObject.h"
+#include "Misc/OutputDeviceError.h"
 #include "Serialization/JsonSerializer.h"
 
 void FAndroidSentrySubsystem::InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler)
@@ -296,3 +297,9 @@ TSharedPtr<ISentryTransactionContext> FAndroidSentrySubsystem::ContinueTrace(con
 
 	return MakeShareable(new FAndroidSentryTransactionContext(*transactionContext));
 }
+
+void FAndroidSentrySubsystem::HandleAssert()
+{
+	GError->HandleError();
+	PLATFORM_BREAK();
+}

plugin-dev/Source/Sentry/Private/Android/AndroidSentrySubsystem.h

@@ -36,6 +36,8 @@ class FAndroidSentrySubsystem : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndTimestamp(TSharedPtr<ISentryTransactionContext> context, int64 timestamp) override;
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override;
+
+	virtual void HandleAssert() override;
 };
 
 typedef FAndroidSentrySubsystem FPlatformSentrySubsystem;

plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.h

@@ -37,6 +37,8 @@ class FAppleSentrySubsystem : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override;
 
+	virtual void HandleAssert() override {}
+
 	virtual FString TryCaptureScreenshot() const { return FString(); };
 
 protected:

plugin-dev/Source/Sentry/Private/GenericPlatform/GenericPlatformSentrySubsystem.h

@@ -49,6 +49,8 @@ class FGenericPlatformSentrySubsystem : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override;
 
+	virtual void HandleAssert() override {}
+
 	USentryBeforeSendHandler* GetBeforeSendHandler();
 	USentryBeforeBreadcrumbHandler* GetBeforeBreadcrumbHandler();
 

plugin-dev/Source/Sentry/Private/IOS/IOSSentrySubsystem.cpp

@@ -46,7 +46,7 @@ void RestoreDefaultSignalHandlers()
 
 static void IOSSentrySignalHandler(int Signal, siginfo_t* Info, void* Context)
 {
-	if (GIOSSentrySubsystem && GIOSSentrySubsystem->IsEnabled())
+	if (GIOSSentrySubsystem && GIOSSentrySubsystem->IsEnabled() && GIOSSentrySubsystem->IsScreenshotEnabled())
 	{
 		GIOSSentrySubsystem->TryCaptureScreenshot();
 	}
@@ -72,14 +72,22 @@ void InstallSentrySignalHandler()
 	sigaction(SIGSYS, &Action, NULL);
 }
 
-void FIOSSentrySubsystem::InitWithSettings(const USentrySettings* Settings, USentryBeforeSendHandler* BeforeSendHandler, USentryBeforeBreadcrumbHandler* BeforeBreadcrumbHandler, USentryTraceSampler* TraceSampler)
+void FIOSSentrySubsystem::InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler)
 {
 	GIOSSentrySubsystem = this;
 
 	SaveDefaultSignalHandlers();
 	InstallSentrySignalHandler();
 
-	FAppleSentrySubsystem::InitWithSettings(Settings, BeforeSendHandler, BeforeBreadcrumbHandler, TraceSampler);
+	FAppleSentrySubsystem::InitWithSettings(settings, beforeSendHandler, beforeBreadcrumbHandler, traceSampler);
+}
+
+void FIOSSentrySubsystem::HandleAssert()
+{
+	if (isScreenshotAttachmentEnabled)
+	{
+		TryCaptureScreenshot();
+	}
 }
 
 FString FIOSSentrySubsystem::TryCaptureScreenshot() const

plugin-dev/Source/Sentry/Private/IOS/IOSSentrySubsystem.h

@@ -9,8 +9,12 @@ class FIOSSentrySubsystem : public FAppleSentrySubsystem
 public:
 	virtual void InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler) override;
 
+	virtual void HandleAssert() override;
+
 	virtual FString TryCaptureScreenshot() const override;
 
+	bool IsScreenshotEnabled() const { return isScreenshotAttachmentEnabled; }
+
 protected:
 	virtual FString GetGameLogPath() const override;
 	virtual FString GetLatestGameLog() const override;

plugin-dev/Source/Sentry/Private/Interface/SentrySubsystemInterface.h

@@ -29,6 +29,7 @@ class ISentrySubsystem
 public:
 	virtual ~ISentrySubsystem() = default;
 
+	/** Methods that map directly to the platform's Sentry SDK API */
 	virtual void InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler) = 0;
 	virtual void Close() = 0;
 	virtual bool IsEnabled() = 0;
@@ -58,4 +59,7 @@ class ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndTimestamp(TSharedPtr<ISentryTransactionContext> context, int64 timestamp) = 0;
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) = 0;
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) = 0;
+
+	/** Unreal-specific methods that are not part of the platform's Sentry SDK API */
+	virtual void HandleAssert() = 0;
 };

plugin-dev/Source/Sentry/Private/Mac/MacSentrySubsystem.cpp

@@ -14,9 +14,9 @@
 #include "Misc/FileHelper.h"
 #include "Misc/Paths.h"
 
-void FMacSentrySubsystem::InitWithSettings(const USentrySettings* Settings, USentryBeforeSendHandler* BeforeSendHandler, USentryBeforeBreadcrumbHandler* BeforeBreadcrumbHandler, USentryTraceSampler* TraceSampler)
+void FMacSentrySubsystem::InitWithSettings(const USentrySettings* settings, USentryBeforeSendHandler* beforeSendHandler, USentryBeforeBreadcrumbHandler* beforeBreadcrumbHandler, USentryTraceSampler* traceSampler)
 {
-	FAppleSentrySubsystem::InitWithSettings(Settings, BeforeSendHandler, BeforeBreadcrumbHandler, TraceSampler);
+	FAppleSentrySubsystem::InitWithSettings(settings, beforeSendHandler, beforeBreadcrumbHandler, traceSampler);
 
 	if (IsEnabled() && isScreenshotAttachmentEnabled)
 	{

plugin-dev/Source/Sentry/Private/Null/NullSentrySubsystem.h

@@ -36,6 +36,8 @@ class FNullSentrySubsystem : public ISentrySubsystem
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndTimestamp(TSharedPtr<ISentryTransactionContext> context, int64 timestamp) override { return nullptr; }
 	virtual TSharedPtr<ISentryTransaction> StartTransactionWithContextAndOptions(TSharedPtr<ISentryTransactionContext> context, const TMap<FString, FString>& options) override { return nullptr; }
 	virtual TSharedPtr<ISentryTransactionContext> ContinueTrace(const FString& sentryTrace, const TArray<FString>& baggageHeaders) override { return nullptr; }
+
+	virtual void HandleAssert() override {}
 };
 
 typedef FNullSentrySubsystem FPlatformSentrySubsystem;

plugin-dev/Source/Sentry/Private/SentrySubsystem.cpp

@@ -814,19 +814,11 @@ void USentrySubsystem::ConfigureErrorOutputDevice()
 	OutputDeviceError = MakeShareable(new FSentryErrorOutputDevice(GError));
 	if (OutputDeviceError)
 	{
-#if PLATFORM_ANDROID
-		OnAssertDelegate = OutputDeviceError->OnAssert.AddWeakLambda(this, [this](const FString& Message)
-		{
-			GError->HandleError();
-			PLATFORM_BREAK();
-		});
-#elif PLATFORM_IOS
 		OnAssertDelegate = OutputDeviceError->OnAssert.AddWeakLambda(this, [this](const FString& Message)
 		{
 			check(SubsystemNativeImpl);
-			StaticCastSharedPtr<FIOSSentrySubsystem>(SubsystemNativeImpl)->TryCaptureScreenshot();
+			SubsystemNativeImpl->HandleAssert();
 		});
-#endif
 		GError = OutputDeviceError.Get();
 	}
 }