fix(feedback): bubble up feedback capture to objc layer (#4659)

Sources/Sentry/SentryUserFeedbackIntegration.m

@@ -1,9 +1,13 @@
 #import "SentryUserFeedbackIntegration.h"
 #import "SentryOptions+Private.h"
+#import "SentrySDK+Private.h"
 #import "SentrySwift.h"
 
 #if TARGET_OS_IOS && SENTRY_HAS_UIKIT
 
+@interface SentryUserFeedbackIntegration () <SentryUserFeedbackIntegrationDriverDelegate>
+@end
+
 @implementation SentryUserFeedbackIntegration {
     SentryUserFeedbackIntegrationDriver *_driver;
 }
@@ -15,10 +19,18 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     }
 
     _driver = [[SentryUserFeedbackIntegrationDriver alloc]
-        initWithConfiguration:options.userFeedbackConfiguration];
+        initWithConfiguration:options.userFeedbackConfiguration
+                     delegate:self];
     return YES;
 }
 
+// MARK: SentryUserFeedbackIntegrationDriverDelegate
+
+- (void)captureWithFeedback:(SentryFeedback *)feedback
+{
+    [SentrySDK captureFeedback:feedback];
+}
+
 @end
 
 #endif // TARGET_OS_IOS && SENTRY_HAS_UIKIT

Sources/Sentry/include/SentryPrivate.h

@@ -4,8 +4,6 @@
 #import "SentryDispatchQueueWrapper.h"
 #import "SentryNSDataUtils.h"
 #import "SentryRandom.h"
-#import "SentrySDK+Private.h"
-#import "SentryScope+Private.h"
 #import "SentryTime.h"
 #import "SentryUserAccess.h"
 

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackForm.swift

@@ -8,7 +8,7 @@ import UIKit
 
 @available(iOS 13.0, *)
 protocol SentryUserFeedbackFormDelegate: NSObjectProtocol {
-    func finished()
+    func finished(with feedback: SentryFeedback?)
 }
 
 @available(iOS 13.0, *)
@@ -136,12 +136,11 @@ class SentryUserFeedbackForm: UIViewController {
 
         let feedback = SentryFeedback(message: messageTextView.text, name: fullNameTextField.text, email: emailTextField.text, screenshot: screenshotImageView.image?.pngData())
         SentryLog.log(message: "Sending user feedback", andLevel: .debug)
-        SentrySDK.capture(feedback: feedback)
-        delegate?.finished()
+        delegate?.finished(with: feedback)
     }
 
     func cancelButtonTapped() {
-        delegate?.finished()
+        delegate?.finished(with: nil)
     }
 
     // MARK: Layout

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackIntegrationDriver.swift

@@ -3,18 +3,25 @@ import Foundation
 @_implementationOnly import _SentryPrivate
 import UIKit
 
+@available(iOS 13.0, *) @objc
+protocol SentryUserFeedbackIntegrationDriverDelegate: NSObjectProtocol {
+    func capture(feedback: SentryFeedback)
+}
+
 /**
  * An integration managing a workflow for end users to report feedback via Sentry.
  * - note: The default method to show the feedback form is via a floating widget placed in the bottom trailing corner of the screen. See the configuration classes for alternative options.
  */
 @available(iOS 13.0, *)
 @objcMembers
-class SentryUserFeedbackIntegrationDriver: NSObject {
+class SentryUserFeedbackIntegrationDriver: NSObject, SentryUserFeedbackWidgetDelegate {
     let configuration: SentryUserFeedbackConfiguration
     private var window: SentryUserFeedbackWidget.Window?
+    weak var delegate: (any SentryUserFeedbackIntegrationDriverDelegate)?
 
-    public init(configuration: SentryUserFeedbackConfiguration) {
+    public init(configuration: SentryUserFeedbackConfiguration, delegate: any SentryUserFeedbackIntegrationDriverDelegate) {
         self.configuration = configuration
+        self.delegate = delegate
         super.init()
 
         if let widgetConfigBuilder = configuration.configureWidget {
@@ -49,7 +56,7 @@ class SentryUserFeedbackIntegrationDriver: NSObject {
      * If `SentryUserFeedbackConfiguration.autoInject` is `false`, this must be called explicitly.
      */
     func createWidget() {
-        window = SentryUserFeedbackWidget.Window(config: configuration)
+        window = SentryUserFeedbackWidget.Window(config: configuration, delegate: self)
         window?.isHidden = false
     }
 
@@ -78,6 +85,12 @@ class SentryUserFeedbackIntegrationDriver: NSObject {
             SentryLog.warning("Invalid widget location specified: \(config.location). Must specify either one edge or one corner of the screen rect to place the widget.")
         }
     }
+
+    // MARK: SentryUserFeedbackWidgetDelegate
+
+    func capture(feedback: SentryFeedback) {
+        delegate?.capture(feedback: feedback)
+    }
 }
 
 #endif // os(iOS) && !SENTRY_NO_UIKIT

Sources/Swift/Integrations/UserFeedback/SentryUserFeedbackWidget.swift

@@ -7,6 +7,10 @@ import UIKit
 
 var displayingForm = false
 
+protocol SentryUserFeedbackWidgetDelegate: NSObjectProtocol {
+    func capture(feedback: SentryFeedback)
+}
+
 @available(iOS 13.0, *)
 struct SentryUserFeedbackWidget {
     class Window: UIWindow {
@@ -22,8 +26,11 @@ struct SentryUserFeedbackWidget {
 
             let config: SentryUserFeedbackConfiguration
 
-            init(config: SentryUserFeedbackConfiguration) {
+            weak var delegate: (any SentryUserFeedbackWidgetDelegate)?
+
+            init(config: SentryUserFeedbackConfiguration, delegate: any SentryUserFeedbackWidgetDelegate) {
                 self.config = config
+                self.delegate = delegate
                 super.init(nibName: nil, bundle: nil)
                 view.addSubview(button)
 
@@ -68,8 +75,12 @@ struct SentryUserFeedbackWidget {
 
             // MARK: SentryUserFeedbackFormDelegate
 
-            func finished() {
+            func finished(with feedback: SentryFeedback?) {
                 closeForm()
+
+                if let feedback = feedback {
+                    delegate?.capture(feedback: feedback)
+                }
             }
 
             // MARK: UIAdaptivePresentationControllerDelegate
@@ -79,9 +90,9 @@ struct SentryUserFeedbackWidget {
             }
         }
 
-        init(config: SentryUserFeedbackConfiguration) {
+        init(config: SentryUserFeedbackConfiguration, delegate: any SentryUserFeedbackWidgetDelegate) {
             super.init(frame: UIScreen.main.bounds)
-            rootViewController = RootViewController(config: config)
+            rootViewController = RootViewController(config: config, delegate: delegate)
             windowLevel = config.widgetConfig.windowLevel
         }