Use ToastView for notification setup

This commit is contained in:
Leon Böttger authored and Leon Böttger committed 2026-03-14 21:20:45 +01:00
1 parent 74226d2fc3
commit 130935c01d
11 files changed
+1674 -46

No files matched your search

+50 -13
View File
@@ -8,6 +8,9 @@
import SwiftUI
import StoreKit
import LUI
#if os(macOS)
import AppKit
#endif
class ReceiveModel: ObservableObject, InboundAppDelegate {
@@ -90,19 +93,35 @@ class ReceiveModel: ObservableObject, InboundAppDelegate {
let resolvedSenderName = (senderName?.isEmpty == false) ? senderName! : "AndroidDevice".localized()
self.activeDeviceName = resolvedSenderName
let alert = NSAlert()
alert.alertStyle = .informational
alert.messageText = "NotificationSyncConsentPromptFromDevice".localized(with: resolvedSenderName)
alert.informativeText = pinCodeMessage
alert.addButton(withTitle: "Accept".localized())
alert.addButton(withTitle: "Decline".localized())
let result = alert.runModal()
if result == .alertFirstButtonReturn {
primaryButtonAction(true)
} else {
secondaryButtonAction()
}
let pinCode = transfer.pinCode ?? "----"
self.consentState = ConsentToastState(
transferID: transferID,
pinCodeMessage: resolvedSenderName,
message: "NotificationSyncToastEnableSubtitle".localized(),
notificationSyncStage: .consent,
allowsTrust: false,
acceptAction: { [weak self] _ in
guard let self else { return }
primaryButtonAction(false)
self.consentState = ConsentToastState(
transferID: transferID,
pinCodeMessage: resolvedSenderName,
message: "NotificationSyncToastPinSubtitle".localized(with: pinCode),
notificationSyncStage: .pin,
allowsTrust: false,
acceptAction: { _ in },
declineAction: {}
)
self.showQuickDropToast(for: transferID)
},
declineAction: { [weak self] in
guard let self else { return }
self.consentState = nil
secondaryButtonAction()
self.hideQuickDropToast(style: .fade)
}
)
self.showQuickDropToast(for: transferID)
return
}
@@ -113,6 +132,7 @@ class ReceiveModel: ObservableObject, InboundAppDelegate {
transferID: transferID,
pinCodeMessage: pinCodeMessage,
message: mainMessage,
notificationSyncStage: nil,
allowsTrust: transfer.allowsToBeAddedAsTrustedDevice,
acceptAction: { [weak self] trustDevice in
DispatchQueue.main.async {
@@ -199,6 +219,17 @@ class ReceiveModel: ObservableObject, InboundAppDelegate {
}
#endif
}
func notificationSyncSetupConfirmed() {
#if os(macOS)
DispatchQueue.main.async {
if self.consentState?.notificationSyncStage != nil {
self.hideQuickDropToast(style: .fade)
}
}
#endif
}
func connectionWasTerminated(connectionID: String, from device: RemoteDeviceInfo?, savedFiles: [URL], wasPlainTextTransfer: Bool, error: (any Error)?) {
@@ -657,9 +688,15 @@ class ReceiveModel: ObservableObject, InboundAppDelegate {
struct ConsentToastState {
enum NotificationSyncStage {
case consent
case pin
}
let transferID: String
let pinCodeMessage: String
let message: String
let notificationSyncStage: NotificationSyncStage?
let allowsTrust: Bool
let acceptAction: (Bool) -> ()
let declineAction: () -> ()