mirror of
https://github.com/sudosylabs/vnidrop.git
synced 2026-08-05 02:29:55 +02:00
refactor(apple): remove diagnostics opt-in toggle, keep bug reports
Drop the Share-diagnostics preference, its Settings toggle and the DiagnosticsBuildConfig stub. Bug reporting (NoopBugReportService) and the diagnostics install id used for bug-report correlation are retained.
This commit is contained in:
@@ -15,8 +15,7 @@ final class SettingsModelTests: XCTestCase {
|
|||||||
preferences: preferences,
|
preferences: preferences,
|
||||||
notifications: LocalNotificationService(),
|
notifications: LocalNotificationService(),
|
||||||
messages: UiMessageController(),
|
messages: UiMessageController(),
|
||||||
bugReports: NoopBugReportService(),
|
bugReports: NoopBugReportService()
|
||||||
diagnosticsIncluded: false
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,7 @@ final class AppGraph: ObservableObject {
|
|||||||
fallback: AppPreferencesDefaults(
|
fallback: AppPreferencesDefaults(
|
||||||
username: dependencies.environment.defaultUsername,
|
username: dependencies.environment.defaultUsername,
|
||||||
receiveFolder: dependencies.fileSystemService.defaultReceiveFolder(),
|
receiveFolder: dependencies.fileSystemService.defaultReceiveFolder(),
|
||||||
themeMode: .system,
|
themeMode: .system
|
||||||
diagnosticsEnabled: false
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.approvalCoordinator = ApprovalCoordinator(
|
self.approvalCoordinator = ApprovalCoordinator(
|
||||||
|
|||||||
@@ -120,7 +120,6 @@ struct AppPreferences: Equatable {
|
|||||||
var username: String
|
var username: String
|
||||||
var receiveFolder: ReceiveFolder
|
var receiveFolder: ReceiveFolder
|
||||||
var themeMode: ThemeMode
|
var themeMode: ThemeMode
|
||||||
var diagnosticsEnabled: Bool
|
|
||||||
var diagnosticsInstallId: String
|
var diagnosticsInstallId: String
|
||||||
var relayConfiguration: RelayConfiguration
|
var relayConfiguration: RelayConfiguration
|
||||||
}
|
}
|
||||||
@@ -129,7 +128,6 @@ struct AppPreferencesDefaults {
|
|||||||
let username: String
|
let username: String
|
||||||
let receiveFolder: ReceiveFolder
|
let receiveFolder: ReceiveFolder
|
||||||
let themeMode: ThemeMode
|
let themeMode: ThemeMode
|
||||||
var diagnosticsEnabled: Bool = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@MainActor
|
@MainActor
|
||||||
@@ -145,7 +143,6 @@ final class AppPreferencesRepository: ObservableObject {
|
|||||||
static let receiveFolderValue = "receive_folder_value"
|
static let receiveFolderValue = "receive_folder_value"
|
||||||
static let receiveFolderDisplayName = "receive_folder_display_name"
|
static let receiveFolderDisplayName = "receive_folder_display_name"
|
||||||
static let themeMode = "theme_mode"
|
static let themeMode = "theme_mode"
|
||||||
static let diagnosticsEnabled = "diagnostics_enabled"
|
|
||||||
static let diagnosticsInstallId = "diagnostics_install_id"
|
static let diagnosticsInstallId = "diagnostics_install_id"
|
||||||
static let relayConfiguration = "relay_configuration"
|
static let relayConfiguration = "relay_configuration"
|
||||||
}
|
}
|
||||||
@@ -160,13 +157,11 @@ final class AppPreferencesRepository: ObservableObject {
|
|||||||
let username = (defaults.string(forKey: Key.username)).flatMap { $0.isEmpty ? nil : $0 } ?? fallback.username
|
let username = (defaults.string(forKey: Key.username)).flatMap { $0.isEmpty ? nil : $0 } ?? fallback.username
|
||||||
let folder = resolveReceiveFolder(defaults, fallback: fallback.receiveFolder)
|
let folder = resolveReceiveFolder(defaults, fallback: fallback.receiveFolder)
|
||||||
let themeMode = defaults.string(forKey: Key.themeMode).flatMap(ThemeMode.init(rawValue:)) ?? fallback.themeMode
|
let themeMode = defaults.string(forKey: Key.themeMode).flatMap(ThemeMode.init(rawValue:)) ?? fallback.themeMode
|
||||||
let diagnostics = defaults.object(forKey: Key.diagnosticsEnabled) as? Bool ?? fallback.diagnosticsEnabled
|
|
||||||
let installId = defaults.string(forKey: Key.diagnosticsInstallId) ?? ""
|
let installId = defaults.string(forKey: Key.diagnosticsInstallId) ?? ""
|
||||||
return AppPreferences(
|
return AppPreferences(
|
||||||
username: username,
|
username: username,
|
||||||
receiveFolder: folder,
|
receiveFolder: folder,
|
||||||
themeMode: themeMode,
|
themeMode: themeMode,
|
||||||
diagnosticsEnabled: diagnostics,
|
|
||||||
diagnosticsInstallId: installId,
|
diagnosticsInstallId: installId,
|
||||||
relayConfiguration: resolveRelayConfiguration(defaults)
|
relayConfiguration: resolveRelayConfiguration(defaults)
|
||||||
)
|
)
|
||||||
@@ -219,11 +214,6 @@ final class AppPreferencesRepository: ObservableObject {
|
|||||||
reload()
|
reload()
|
||||||
}
|
}
|
||||||
|
|
||||||
func setDiagnosticsEnabled(_ enabled: Bool) {
|
|
||||||
defaults.set(enabled, forKey: Key.diagnosticsEnabled)
|
|
||||||
reload()
|
|
||||||
}
|
|
||||||
|
|
||||||
func setRelayConfiguration(_ configuration: RelayConfiguration) {
|
func setRelayConfiguration(_ configuration: RelayConfiguration) {
|
||||||
guard let encoded = try? JSONEncoder().encode(configuration) else { return }
|
guard let encoded = try? JSONEncoder().encode(configuration) else { return }
|
||||||
defaults.set(encoded, forKey: Key.relayConfiguration)
|
defaults.set(encoded, forKey: Key.relayConfiguration)
|
||||||
|
|||||||
@@ -24,8 +24,3 @@ struct NoopBugReportService: BugReportService {
|
|||||||
}
|
}
|
||||||
func previewLogBytes() async -> Int { 0 }
|
func previewLogBytes() async -> Int { 0 }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Whether the diagnostics stack is compiled in (mirrors DiagnosticsBuildConfig).
|
|
||||||
enum DiagnosticsBuildConfig {
|
|
||||||
static let included = false
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ struct SettingsState: Equatable {
|
|||||||
var supportsCustomReceiveFolders = true
|
var supportsCustomReceiveFolders = true
|
||||||
var themeMode: ThemeMode = .system
|
var themeMode: ThemeMode = .system
|
||||||
var notificationPermission: NotificationPermission = .notDetermined
|
var notificationPermission: NotificationPermission = .notDetermined
|
||||||
var diagnosticsEnabled = false
|
|
||||||
var relayMode: RelayPreferenceMode = .automatic
|
var relayMode: RelayPreferenceMode = .automatic
|
||||||
var relayURLs: [String] = []
|
var relayURLs: [String] = []
|
||||||
var relayValidationError: RelayConfigurationValidationError?
|
var relayValidationError: RelayConfigurationValidationError?
|
||||||
@@ -76,7 +75,7 @@ struct SettingsState: Equatable {
|
|||||||
&& lhs.supportsCustomReceiveFolders == rhs.supportsCustomReceiveFolders
|
&& lhs.supportsCustomReceiveFolders == rhs.supportsCustomReceiveFolders
|
||||||
&& lhs.themeMode == rhs.themeMode
|
&& lhs.themeMode == rhs.themeMode
|
||||||
&& lhs.notificationPermission == rhs.notificationPermission
|
&& lhs.notificationPermission == rhs.notificationPermission
|
||||||
&& lhs.diagnosticsEnabled == rhs.diagnosticsEnabled && lhs.appVersion == rhs.appVersion
|
&& lhs.appVersion == rhs.appVersion
|
||||||
&& lhs.relayMode == rhs.relayMode && lhs.relayURLs == rhs.relayURLs
|
&& lhs.relayMode == rhs.relayMode && lhs.relayURLs == rhs.relayURLs
|
||||||
&& lhs.relayValidationError == rhs.relayValidationError
|
&& lhs.relayValidationError == rhs.relayValidationError
|
||||||
&& lhs.relayConfigurationIsDirty == rhs.relayConfigurationIsDirty
|
&& lhs.relayConfigurationIsDirty == rhs.relayConfigurationIsDirty
|
||||||
@@ -111,7 +110,6 @@ final class SettingsModel: ObservableObject {
|
|||||||
private let notifications: LocalNotificationService
|
private let notifications: LocalNotificationService
|
||||||
private let messages: UiMessageController
|
private let messages: UiMessageController
|
||||||
private let bugReports: BugReportService
|
private let bugReports: BugReportService
|
||||||
private let diagnosticsIncluded: Bool
|
|
||||||
|
|
||||||
private var usernamePersistTask: Task<Void, Never>?
|
private var usernamePersistTask: Task<Void, Never>?
|
||||||
private var hasLocalUsernameDraft = false
|
private var hasLocalUsernameDraft = false
|
||||||
@@ -126,8 +124,7 @@ final class SettingsModel: ObservableObject {
|
|||||||
preferences: AppPreferencesRepository,
|
preferences: AppPreferencesRepository,
|
||||||
notifications: LocalNotificationService,
|
notifications: LocalNotificationService,
|
||||||
messages: UiMessageController,
|
messages: UiMessageController,
|
||||||
bugReports: BugReportService,
|
bugReports: BugReportService
|
||||||
diagnosticsIncluded: Bool = DiagnosticsBuildConfig.included
|
|
||||||
) {
|
) {
|
||||||
self.environment = environment
|
self.environment = environment
|
||||||
self.deviceInfoProvider = deviceInfoProvider
|
self.deviceInfoProvider = deviceInfoProvider
|
||||||
@@ -137,7 +134,6 @@ final class SettingsModel: ObservableObject {
|
|||||||
self.notifications = notifications
|
self.notifications = notifications
|
||||||
self.messages = messages
|
self.messages = messages
|
||||||
self.bugReports = bugReports
|
self.bugReports = bugReports
|
||||||
self.diagnosticsIncluded = diagnosticsIncluded
|
|
||||||
self.state = SettingsState(
|
self.state = SettingsState(
|
||||||
supportsCustomReceiveFolders: fileSystemService.supportsCustomReceiveFolders,
|
supportsCustomReceiveFolders: fileSystemService.supportsCustomReceiveFolders,
|
||||||
appVersion: environment.appVersion
|
appVersion: environment.appVersion
|
||||||
@@ -151,7 +147,6 @@ final class SettingsModel: ObservableObject {
|
|||||||
self.state.username = self.hasLocalUsernameDraft ? self.state.username : prefs.username
|
self.state.username = self.hasLocalUsernameDraft ? self.state.username : prefs.username
|
||||||
self.state.receiveFolder = folder
|
self.state.receiveFolder = folder
|
||||||
self.state.themeMode = prefs.themeMode
|
self.state.themeMode = prefs.themeMode
|
||||||
self.state.diagnosticsEnabled = prefs.diagnosticsEnabled
|
|
||||||
if !self.hasRelayConfigurationDraft {
|
if !self.hasRelayConfigurationDraft {
|
||||||
self.state.relayMode = prefs.relayConfiguration.mode
|
self.state.relayMode = prefs.relayConfiguration.mode
|
||||||
self.state.relayURLs = prefs.relayConfiguration.relayURLs
|
self.state.relayURLs = prefs.relayConfiguration.relayURLs
|
||||||
@@ -230,17 +225,6 @@ final class SettingsModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func setDiagnosticsEnabled(_ enabled: Bool) {
|
|
||||||
if !diagnosticsIncluded { return }
|
|
||||||
Task {
|
|
||||||
preferences.setDiagnosticsEnabled(enabled)
|
|
||||||
messages.show(UiMessage(
|
|
||||||
text: .resource(enabled ? L10n.Diagnostics.enabledMessage : L10n.Diagnostics.disabledMessage),
|
|
||||||
tone: .success
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Network
|
// MARK: - Network
|
||||||
|
|
||||||
func setRelayMode(_ mode: RelayPreferenceMode) {
|
func setRelayMode(_ mode: RelayPreferenceMode) {
|
||||||
|
|||||||
@@ -415,17 +415,6 @@ struct AboutSettings: View {
|
|||||||
Label(String(localized: L10n.About.privacyPolicyLabel), systemSymbol: .handRaised)
|
Label(String(localized: L10n.About.privacyPolicyLabel), systemSymbol: .handRaised)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if DiagnosticsBuildConfig.included {
|
|
||||||
Section {
|
|
||||||
Toggle(isOn: Binding(
|
|
||||||
get: { model.state.diagnosticsEnabled },
|
|
||||||
set: { model.setDiagnosticsEnabled($0) }
|
|
||||||
)) {
|
|
||||||
Text(String(localized: L10n.Diagnostics.title))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user