Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

fix event purge

grohith327a3cd3db25f63
diff --git a/Sources/Fluid/Analytics/AnalyticsService.swift b/Sources/Fluid/Analytics/AnalyticsService.swift
index 036be0e5..02417079 100644
--- a/Sources/Fluid/Analytics/AnalyticsService.swift
+++ b/Sources/Fluid/Analytics/AnalyticsService.swift
@@ -4,9 +4,14 @@ import Foundation
final class AnalyticsService {
static let shared = AnalyticsService()
- private let core = AnalyticsCore()
+ private let consentGate: AnalyticsConsentGate
+ private let core: AnalyticsCore
- private init() {}
+ private init() {
+ let consentGate = AnalyticsConsentGate()
+ self.consentGate = consentGate
+ self.core = AnalyticsCore(consentGate: consentGate)
+ }
func bootstrap() {
self.submit { core, context in
@@ -15,9 +20,10 @@ final class AnalyticsService {
}
func setEnabled(_ enabled: Bool) {
- let context = Self.context(enabled: enabled)
+ let consentGeneration = self.consentGate.advance()
+ let context = Self.context(enabled: enabled, consentGeneration: consentGeneration)
Task.detached(priority: .background) { [core] in
- await core.setEnabled(enabled, context: context)
+ await core.setEnabled(context: context)
}
}
@@ -120,16 +126,20 @@ final class AnalyticsService {
private func submit(
_ operation: @escaping @Sendable (AnalyticsCore, AnalyticsContext) async -> Void
) {
- let context = Self.context(enabled: SettingsStore.shared.shareAnonymousAnalytics)
+ let context = Self.context(
+ enabled: SettingsStore.shared.shareAnonymousAnalytics,
+ consentGeneration: self.consentGate.currentGeneration
+ )
Task.detached(priority: .background) { [core] in
await operation(core, context)
}
}
- private static func context(enabled: Bool) -> AnalyticsContext {
+ private static func context(enabled: Bool, consentGeneration: UInt64) -> AnalyticsContext {
let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "unknown"
return AnalyticsContext(
enabled: enabled,
+ consentGeneration: consentGeneration,
config: AnalyticsConfig.fromBundle(),
distinctID: AnalyticsIdentityStore.shared.anonymousInstallID,
appVersion: version
@@ -139,21 +149,47 @@ final class AnalyticsService {
private struct AnalyticsContext {
let enabled: Bool
+ let consentGeneration: UInt64
let config: AnalyticsConfig
let distinctID: String
let appVersion: String
}
+final nonisolated class AnalyticsConsentGate: @unchecked Sendable {
+ private let lock = NSLock()
+ private var generation: UInt64 = 0
+
+ var currentGeneration: UInt64 {
+ self.lock.withLock { self.generation }
+ }
+
+ func advance() -> UInt64 {
+ self.lock.withLock {
+ self.generation &+= 1
+ return self.generation
+ }
+ }
+
+ func accepts(_ generation: UInt64) -> Bool {
+ self.lock.withLock { generation == self.generation }
+ }
+}
+
private actor AnalyticsCore {
private var context: AnalyticsContext?
+ private let consentGate: AnalyticsConsentGate
private var database: AnalyticsDatabase?
private var flushTask: Task<Void, Never>?
private var isFlushing = false
private let batchSize = 50
+ init(consentGate: AnalyticsConsentGate) {
+ self.consentGate = consentGate
+ }
+
func bootstrap(context: AnalyticsContext) async {
- self.context = context
+ guard self.apply(context) else { return }
guard context.enabled else {
try? self.purgeStoredAnalyticsIfPresent(context: context)
return
@@ -170,9 +206,9 @@ private actor AnalyticsCore {
}
}
- func setEnabled(_ enabled: Bool, context: AnalyticsContext) async {
- self.context = context
- if !enabled {
+ func setEnabled(context: AnalyticsContext) async {
+ guard self.apply(context) else { return }
+ if !context.enabled {
self.stopFlushLoop()
try? self.purgeStoredAnalyticsIfPresent(context: context)
return
@@ -282,7 +318,7 @@ private actor AnalyticsCore {
context: AnalyticsContext,
operation: (AnalyticsDatabase, Date) throws -> Void
) async {
- self.context = context
+ guard self.apply(context) else { return }
guard context.enabled, context.config.isConfigured else { return }
do {
let database = try self.database(for: context)
@@ -293,6 +329,12 @@ private actor AnalyticsCore {
}
}
+ private func apply(_ context: AnalyticsContext) -> Bool {
+ guard self.consentGate.accepts(context.consentGeneration) else { return false }
+ self.context = context
+ return true
+ }
+
private func database(for context: AnalyticsContext) throws -> AnalyticsDatabase {
if let database { return database }
let url = try self.databaseURL()
@@ -335,7 +377,12 @@ private actor AnalyticsCore {
}
private func startFlushLoopIfNeeded() {
- guard self.flushTask == nil, let context, context.enabled, context.config.isConfigured else { return }
+ guard self.flushTask == nil,
+ let context,
+ self.consentGate.accepts(context.consentGeneration),
+ context.enabled,
+ context.config.isConfigured
+ else { return }
self.flushTask = Task { [weak self] in
while !Task.isCancelled {
try? await Task.sleep(for: .seconds(30))
@@ -353,6 +400,7 @@ private actor AnalyticsCore {
private func flushIfNeeded() async {
guard !self.isFlushing,
let context,
+ self.consentGate.accepts(context.consentGeneration),
context.enabled,
context.config.isConfigured,
let database
@@ -369,6 +417,7 @@ private actor AnalyticsCore {
return
}
guard !items.isEmpty else { return }
+ guard self.consentGate.accepts(context.consentGeneration) else { return }
let ids = items.map(\.id)
let status: Int
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index 4419c0fe..345c31aa 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -2687,38 +2687,6 @@ struct OnboardingFlowView: View {
)
}
- private var orderedOnboardingInputDevices: [AudioDevice.Device] {
- let devicesByUID = Dictionary(
- self.onboardingInputDevices.map { ($0.uid, $0) },
- uniquingKeysWith: { current, _ in current }
- )
- var ordered = self.settings.microphonePriority.compactMap { devicesByUID[$0.uid] }
- let knownUIDs = Set(ordered.map(\.uid))
- ordered.append(contentsOf: self.onboardingInputDevices.filter { !knownUIDs.contains($0.uid) })
- return ordered
- }
-
- private func isOnboardingRouteSelected(_ route: VoiceEngineLanguageRoute) -> Bool {
- self.selectedOnboardingRoute?.id == route.id || self.isRouteSelectedInSettings(route)
- }
-
- private func isRouteSelectedInSettings(_ route: VoiceEngineLanguageRoute) -> Bool {
- guard route.model == self.settings.selectedSpeechModel else {
- return false
- }
-
- switch route.binding {
- case .automatic, .whisper:
- return self.settings.onboardingSelectedLanguageID == route.language.id
- case let .appleSpeech(localeIdentifier):
- return self.settings.selectedAppleSpeechLocaleIdentifier == localeIdentifier
- case let .cohere(language):
- return self.settings.selectedCohereLanguage == language
- case let .nemotron(language):
- return self.settings.selectedNemotronLanguage == language
- }
- }
-
private func isRouteModelAndLanguageSettingsSelected(_ route: VoiceEngineLanguageRoute) -> Bool {
guard route.model == self.settings.selectedSpeechModel else {
return false
@@ -2873,6 +2841,38 @@ struct OnboardingFlowView: View {
}
private extension OnboardingFlowView {
+ var orderedOnboardingInputDevices: [AudioDevice.Device] {
+ let devicesByUID = Dictionary(
+ self.onboardingInputDevices.map { ($0.uid, $0) },
+ uniquingKeysWith: { current, _ in current }
+ )
+ var ordered = self.settings.microphonePriority.compactMap { devicesByUID[$0.uid] }
+ let knownUIDs = Set(ordered.map(\.uid))
+ ordered.append(contentsOf: self.onboardingInputDevices.filter { !knownUIDs.contains($0.uid) })
+ return ordered
+ }
+
+ func isOnboardingRouteSelected(_ route: VoiceEngineLanguageRoute) -> Bool {
+ self.selectedOnboardingRoute?.id == route.id || self.isRouteSelectedInSettings(route)
+ }
+
+ func isRouteSelectedInSettings(_ route: VoiceEngineLanguageRoute) -> Bool {
+ guard route.model == self.settings.selectedSpeechModel else {
+ return false
+ }
+
+ switch route.binding {
+ case .automatic, .whisper:
+ return self.settings.onboardingSelectedLanguageID == route.language.id
+ case let .appleSpeech(localeIdentifier):
+ return self.settings.selectedAppleSpeechLocaleIdentifier == localeIdentifier
+ case let .cohere(language):
+ return self.settings.selectedCohereLanguage == language
+ case let .nemotron(language):
+ return self.settings.selectedNemotronLanguage == language
+ }
+ }
+
func refreshOnboardingMicrophoneAuthorization(checkModels: Bool = false) {
Task { @MainActor in
await AudioStartupGate.shared.scheduleOpenAfterInitialUISettled()
diff --git a/Tests/FluidDictationIntegrationTests/AnalyticsDatabaseTests.swift b/Tests/FluidDictationIntegrationTests/AnalyticsDatabaseTests.swift
index f4d710a4..2ad73ef3 100644
--- a/Tests/FluidDictationIntegrationTests/AnalyticsDatabaseTests.swift
+++ b/Tests/FluidDictationIntegrationTests/AnalyticsDatabaseTests.swift
@@ -109,6 +109,15 @@ final class AnalyticsDatabaseTests: XCTestCase {
XCTAssertEqual(finish.properties["duration_seconds"] as? Double, 25)
}
+ func testConsentGateRejectsWorkQueuedBeforeOptOut() {
+ let gate = AnalyticsConsentGate()
+ let queuedGeneration = gate.currentGeneration
+ let currentGeneration = gate.advance()
+
+ XCTAssertFalse(gate.accepts(queuedGeneration))
+ XCTAssertTrue(gate.accepts(currentGeneration))
+ }
+
private func makeDatabase(url: URL? = nil) throws -> AnalyticsDatabase {
var calendar = Calendar(identifier: .gregorian)
calendar.timeZone = try XCTUnwrap(TimeZone(secondsFromGMT: 0))