Merge 373eded into 77e097d

Author: armcknight

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Apps can now manually show and hide the included feedback widget button (#5236)
+
 ## 8.50.2
 
 ### Fixes

Samples/SentrySampleShared/SentrySampleShared/SentrySDKOverrides.swift

@@ -58,10 +58,7 @@ public enum SentrySDKOverrides {
 
         public var boolValue: Bool {
             get {
-                switch self {
-                case .disableAutoInject: return getBoolOverride(for: rawValue)
-                default: return getBoolOverride(for: rawValue)
-                }
+                return getBoolOverride(for: rawValue)
             }
             set(newValue) {
                 setBoolOverride(for: rawValue, value: newValue)

Samples/iOS-Swift/iOS-Swift-UITests/UserFeedbackUITests.swift

@@ -489,6 +489,8 @@ extension UserFeedbackUITests {
         XCTAssertEqual(try dictionaryFromSuccessHookFile(), ["name": testName, "message": "UITest user feedback", "email": testContactEmail])
     }
 
+    // MARK: Alternative widget control
+
     func testFormShowsAndDismissesProperlyWithCustomButton() {
         launchApp(args: ["--io.sentry.feedback.use-custom-feedback-button"])
 
@@ -512,6 +514,16 @@ extension UserFeedbackUITests {
         XCTAssert(customButton.isHittable)
         XCTAssertFalse(widgetButton.isHittable)
     }
+
+    func testManuallyDisplayingWidget() {
+        launchApp(args: ["--io.sentry.feedback.no-auto-inject-widget"])
+        XCTAssertFalse(widgetButton.isHittable)
+        extrasAreaTabBarButton.tap()
+        app.buttons["io.sentry.ui-test.button.show-widget"].tap()
+        XCTAssert(widgetButton.isHittable)
+        app.buttons["io.sentry.ui-test.button.hide-widget"].tap()
+        XCTAssertFalse(widgetButton.isHittable)
+    }
 }
 
 // MARK: UI Element access

Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard

@@ -348,4 +348,20 @@ class ExtraViewController: UIViewController {
             result["item_header_type"] = json["type"]
         }
     }
+
+    @IBAction func showFeedbackWidget(_ sender: Any) {
+        if #available(iOS 13.0, *) {
+            SentrySDK.showFeedbackWidget()
+        } else {
+            showToast(in: self, type: .warning, message: "Feedback widget only available in iOS 13 or later.")
+        }
+    }
+
+    @IBAction func hideFeedbackWidget(_ sender: Any) {
+        if #available(iOS 13.0, *) {
+            SentrySDK.hideFeedbackWidget()
+        } else {
+            showToast(in: self, type: .warning, message: "Feedback widget only available in iOS 13 or later.")
+        }
+    }
 }

Samples/iOS-Swift/iOS-Swift/ExtraViewController.swift

@@ -798,6 +798,7 @@ typedef void (^SentryProfilingConfigurationBlock)(SentryProfileOptions *_Nonnull
  * either this block to configure a widget and UI form to gather feedback, or directly submits
  * feedback you've gathered using your own UI by calling the method @c SentrySDK.captureFeedback
  * (se https://docs.sentry.io/platforms/apple/user-feedback/configuration/).
+ * @note User feedback widget is only available for iOS 13 or later.
  */
 @property (nonatomic, copy, nullable)
     SentryUserFeedbackConfigurationBlock configureUserFeedback API_AVAILABLE(ios(13.0));

Sources/Sentry/Public/SentryOptions.h

@@ -263,13 +263,34 @@ SENTRY_NO_INIT
 
 /**
  * Captures user feedback that was manually gathered and sends it to Sentry.
+ * @warning This is an experimental feature and may still have bugs.
  * @param feedback The feedback to send to Sentry.
  * @note If you'd prefer not to have to build the UI required to gather the feedback from the user,
  * see @c SentryOptions.configureUserFeedback to customize a fully managed integration. See
  * https://docs.sentry.io/platforms/apple/user-feedback/ for more information.
  */
 + (void)captureFeedback:(SentryFeedback *)feedback NS_SWIFT_NAME(capture(feedback:));
 
+#if TARGET_OS_IOS && SENTRY_HAS_UIKIT
+
+/**
+ * Show the feedback widget button.
+ * @warning This is an experimental feature and may still have bugs.
+ * @seealso See @c SentryOptions.configureUserFeedback to configure the widget.
+ * @note User feedback widget is only available for iOS 13 or later.
+ */
++ (void)showFeedbackWidget API_AVAILABLE(ios(13.0));
+
+/**
+ * Hide the feedback widget button.
+ * @warning This is an experimental feature and may still have bugs.
+ * @seealso See @c SentryOptions.configureUserFeedback to configure the widget.
+ * @note User feedback widget is only available for iOS 13 or later.
+ */
++ (void)hideFeedbackWidget API_AVAILABLE(ios(13.0));
+
+#endif // TARGET_OS_IOS && SENTRY_HAS_UIKIT
+
 /**
  * Adds a Breadcrumb to the current Scope of the current Hub. If the total number of breadcrumbs
  * exceeds the @c SentryOptions.maxBreadcrumbs  the SDK removes the oldest breadcrumb.

Sources/Sentry/Public/SentrySDK.h

@@ -26,6 +26,7 @@
 #import "SentrySerialization.h"
 #import "SentrySwift.h"
 #import "SentryTransactionContext.h"
+#import "SentryUserFeedbackIntegration.h"
 
 #if TARGET_OS_OSX
 #    import "SentryCrashExceptionApplication.h"
@@ -431,6 +432,32 @@ + (void)captureFeedback:(SentryFeedback *)feedback
     [SentrySDK.currentHub captureFeedback:feedback];
 }
 
+#if TARGET_OS_IOS && SENTRY_HAS_UIKIT
+
++ (void)showFeedbackWidget
+{
+    if (@available(iOS 13.0, *)) {
+        SentryUserFeedbackIntegration *feedback =
+            [currentHub getInstalledIntegration:[SentryUserFeedbackIntegration class]];
+        [feedback showWidget];
+    } else {
+        SENTRY_LOG_WARN(@"Sentry User Feedback is only available on iOS 13 or later.");
+    }
+}
+
++ (void)hideFeedbackWidget
+{
+    if (@available(iOS 13.0, *)) {
+        SentryUserFeedbackIntegration *feedback =
+            [currentHub getInstalledIntegration:[SentryUserFeedbackIntegration class]];
+        [feedback hideWidget];
+    } else {
+        SENTRY_LOG_WARN(@"Sentry User Feedback is only available on iOS 13 or later.");
+    }
+}
+
+#endif // TARGET_OS_IOS && SENTRY_HAS_UIKIT
+
 + (void)addBreadcrumb:(SentryBreadcrumb *)crumb
 {
     [SentrySDK.currentHub addBreadcrumb:crumb];

Sources/Sentry/SentrySDK.m

@@ -27,6 +27,16 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     return YES;
 }
 
+- (void)showWidget
+{
+    [_driver showWidget];
+}
+
+- (void)hideWidget
+{
+    [_driver hideWidget];
+}
+
 // MARK: SentryUserFeedbackIntegrationDriverDelegate
 
 - (void)captureWithFeedback:(SentryFeedback *)feedback

Sources/Sentry/SentryUserFeedbackIntegration.m

@@ -8,7 +8,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 API_AVAILABLE(ios(13.0))
 @interface SentryUserFeedbackIntegration : SentryBaseIntegration
-
+- (void)showWidget;
+- (void)hideWidget;
 @end
 
 NS_ASSUME_NONNULL_END