From ebf1c9cdd899c75a95be3667245421f12d207003 Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Wed, 26 Feb 2025 10:52:43 -0900 Subject: [PATCH] test: invert launch arg so feedback widget is injected by default (#4901) --- .../xcschemes/iOS-ObjectiveC.xcscheme | 6 ++++ .../iOS-ObjectiveC/AppDelegate.m | 6 ++-- .../xcshareddata/xcschemes/iOS-Swift.xcscheme | 4 +-- .../iOS-Swift/SentrySDKWrapper.swift | 30 ++++++++++--------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme b/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme index ddd90504eb..e3a4ce6b53 100644 --- a/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme +++ b/Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/xcshareddata/xcschemes/iOS-ObjectiveC.xcscheme @@ -67,6 +67,12 @@ ReferencedContainer = "container:iOS-ObjectiveC.xcodeproj"> + + + + + argument = "--io.sentry.feedback.no-auto-inject-widget" + isEnabled = "NO"> diff --git a/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift b/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift index 6e6d2e2972..00f52a17f8 100644 --- a/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift +++ b/Samples/iOS-Swift/iOS-Swift/SentrySDKWrapper.swift @@ -128,22 +128,24 @@ extension SentrySDKWrapper { var layoutOffset: UIOffset { UIOffset(horizontal: 25, vertical: 75) } func configureFeedbackWidget(config: SentryUserFeedbackWidgetConfiguration) { - if args.contains("--io.sentry.feedback.auto-inject-widget") { - if Locale.current.languageCode == "ar" { // arabic - config.labelText = "﷽" - } else if Locale.current.languageCode == "ur" { // urdu - config.labelText = "نستعلیق" - } else if Locale.current.languageCode == "he" { // hebrew - config.labelText = "עִבְרִית‎" - } else if Locale.current.languageCode == "hi" { // Hindi - config.labelText = "नागरि" - } else { - config.labelText = "Report Jank" - } - config.layoutUIOffset = layoutOffset - } else { + guard !args.contains("--io.sentry.feedback.no-auto-inject-widget") else { config.autoInject = false + return } + + if Locale.current.languageCode == "ar" { // arabic + config.labelText = "﷽" + } else if Locale.current.languageCode == "ur" { // urdu + config.labelText = "نستعلیق" + } else if Locale.current.languageCode == "he" { // hebrew + config.labelText = "עִבְרִית‎" + } else if Locale.current.languageCode == "hi" { // Hindi + config.labelText = "नागरि" + } else { + config.labelText = "Report Jank" + } + config.layoutUIOffset = layoutOffset + if args.contains("--io.sentry.feedback.no-widget-text") { config.labelText = nil }