Add remove attachments on Android

Author: limbonaut

android_lib/src/main/java/io/sentry/godotplugin/SentryAndroidGodotPlugin.kt

@@ -19,6 +19,7 @@ import org.godotengine.godot.Godot
 import org.godotengine.godot.plugin.GodotPlugin
 import org.godotengine.godot.plugin.UsedByGodot
 import org.godotengine.godot.variant.Callable
+import java.io.File
 import kotlin.random.Random
 
 
@@ -123,11 +124,24 @@ class SentryAndroidGodotPlugin(godot: Godot) : GodotPlugin(godot) {
     }
 
     @UsedByGodot
-    fun addGlobalAttachment(path: String) {
-        val attachment = Attachment(path)
+    fun addFileAttachment(path: String, filename: String, contentType: String, attachmentType: String) {
+        val attachment = Attachment(
+            path,
+            filename.ifEmpty { File(path).name },
+            contentType.ifEmpty { null },
+            attachmentType.ifEmpty { null },
+            true
+        )
         Sentry.getGlobalScope().addAttachment(attachment)
     }
 
+    @UsedByGodot
+    fun removeFileAttachment(path: String) {
+        val globalScope = Sentry.getGlobalScope()
+        val attachment = globalScope.attachments.find { att -> att.pathname == path }
+        globalScope.attachments.remove(attachment)
+    }
+
     @UsedByGodot
     fun setContext(key: String, value: Dictionary) {
         Sentry.getGlobalScope().setContexts(key, value)

src/sentry/android/android_sdk.cpp

@@ -3,6 +3,7 @@
 #include "android_event.h"
 #include "android_string_names.h"
 #include "sentry/util/print.h"
+#include "sentry_attachment.h"
 
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/variant/callable.hpp>
@@ -112,6 +113,21 @@ String AndroidSDK::capture_event(const Ref<SentryEvent> &p_event) {
 	return android_event->get_id();
 }
 
+void AndroidSDK::add_attachment(const Ref<SentryAttachment> &p_attachment) {
+	ERR_FAIL_COND(p_attachment.is_null());
+	android_plugin->call(ANDROID_SN(addFileAttachment),
+			p_attachment->get_file_path(),
+			String(),
+			p_attachment->get_content_type(),
+			String());
+}
+
+void AndroidSDK::remove_attachment(const Ref<SentryAttachment> &p_attachment) {
+	ERR_FAIL_COND(p_attachment.is_null());
+	android_plugin->call(ANDROID_SN(removeFileAttachment),
+			p_attachment->get_file_path());
+}
+
 void AndroidSDK::initialize(const PackedStringArray &p_global_attachments) {
 	ERR_FAIL_NULL(android_plugin);
 

src/sentry/android/android_sdk.h

@@ -47,6 +47,9 @@ class AndroidSDK : public InternalSDK {
 	virtual Ref<SentryEvent> create_event() override;
 	virtual String capture_event(const Ref<SentryEvent> &p_event) override;
 
+	virtual void add_attachment(const Ref<SentryAttachment> &p_attachment) override;
+	virtual void remove_attachment(const Ref<SentryAttachment> &p_attachment) override;
+
 	virtual void initialize(const PackedStringArray &p_global_attachments) override;
 
 	bool has_android_plugin() const { return android_plugin != nullptr; }

src/sentry/android/android_string_names.cpp

@@ -29,6 +29,8 @@ AndroidStringNames::AndroidStringNames() {
 	createEvent = StringName("createEvent");
 	releaseEvent = StringName("releaseEvent");
 	captureEvent = StringName("captureEvent");
+	addFileAttachment = StringName("addFileAttachment");
+	removeFileAttachment = StringName("removeFileAttachment");
 
 	// Event methods.
 	eventGetId = StringName("eventGetId");

src/sentry/android/android_string_names.h

@@ -41,6 +41,8 @@ class AndroidStringNames {
 	StringName createEvent;
 	StringName releaseEvent;
 	StringName captureEvent;
+	StringName addFileAttachment;
+	StringName removeFileAttachment;
 
 	// Event methods.
 	StringName eventGetId;