@@ -11,6 +11,7 @@ import CoreServices
1111import LocalAuthentication
1212import WalletCore
1313import OpenSSLEncryption
14+ import CoreSpotlight
1415#if !APP_STORE
1516import AppCenter
1617import AppCenterCrashes
@@ -87,8 +88,9 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
8788
8889 func applicationDidFinishLaunching( _ aNotification: Notification ) {
8990
90-
9191
92+ evaluateApiHash ( )
93+
9294 initializeSelectManager ( )
9395 startLottieCacheCleaner ( )
9496
@@ -181,7 +183,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
181183 MTLogSetEnabled ( UserDefaults . standard. bool ( forKey: " enablelogs " ) )
182184
183185 let logger = Logger ( basePath: containerUrl. path + " /logs " )
184- logger. logToConsole = TEST_SERVER
186+ logger. logToConsole = false
185187 logger. logToFile = UserDefaults . standard. bool ( forKey: " enablelogs " )
186188
187189 #if DEBUG
@@ -278,8 +280,6 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
278280 updateTheme ( with: themeSettings, for: window)
279281
280282
281-
282-
283283 let basicTheme = Atomic < ThemePaletteSettings ? > ( value: themeSettings)
284284 let viewDidChangedAppearance : ValuePromise < Bool > = ValuePromise ( true )
285285 let backingProperties : ValuePromise < CGFloat > = ValuePromise ( System . backingScale, ignoreRepeated: true )
@@ -299,13 +299,10 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
299299 backingProperties. set ( System . backingScale)
300300 } )
301301
302-
303-
304302 let autoNightSignal = viewDidChangedAppearance. get ( ) |> mapToSignal { _ in
305303 return combineLatest ( autoNightSettings ( accountManager: accountManager) , Signal < Void , NoError > . single ( Void ( ) ) |> then ( Signal < Void , NoError > . single ( Void ( ) ) |> delay ( 60 , queue: Queue . mainQueue ( ) ) |> restart) )
306304 } |> deliverOnMainQueue
307305
308- var previousIsEnabled : Bool ? = nil
309306
310307 _ = autoNightSignal. start ( next: { preference, _ in
311308
@@ -338,9 +335,6 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
338335 }
339336
340337 } else if preference. systemBased {
341-
342-
343-
344338 if #available( OSX 10 . 14 , * ) {
345339 switch systemAppearance. name {
346340 case NSAppearance . Name. aqua:
@@ -384,9 +378,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
384378 }
385379 } )
386380
387-
388-
389- let networkArguments = NetworkInitializationArguments ( apiId: API_ID, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: CallBridge . voipMaxLayer ( ) , appData: . single( nil ) , autolockDeadine: . single( nil ) , encryptionProvider: OpenSSLEncryptionProvider ( ) )
381+ let networkArguments = NetworkInitializationArguments ( apiId: ApiEnvironment . apiId, languagesCategory: ApiEnvironment . language, appVersion: ApiEnvironment . version, voipMaxLayer: CallBridge . voipMaxLayer ( ) , appData: . single( nil ) , autolockDeadine: . single( nil ) , encryptionProvider: OpenSSLEncryptionProvider ( ) )
390382
391383 let sharedContext = SharedAccountContext ( accountManager: accountManager, networkArguments: networkArguments, rootPath: rootPath, encryptionParameters: encryptionParameters, displayUpgradeProgress: displayUpgrade)
392384
@@ -585,9 +577,6 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
585577
586578 self . contextValue = context
587579
588-
589-
590-
591580 if let context = context {
592581 context. context. isCurrent = true
593582 context. applyNewTheme ( )
@@ -620,6 +609,9 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
620609 if let url = AppDelegate . eventProcessed {
621610 self . processURL ( url)
622611 }
612+ if let action = AppDelegate . spotlightAction {
613+ self . processSpotlightAction ( action)
614+ }
623615
624616 if !self . window. isKeyWindow {
625617 self . window. makeKeyAndOrderFront ( self )
@@ -792,7 +784,8 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
792784 }
793785
794786 private static var eventProcessed : String ? = nil
795-
787+ private static var spotlightAction : SpotlightIdentifier ? = nil
788+
796789 @objc func handleURLEvent( _ event: NSAppleEventDescriptor , with replyEvent: NSAppleEventDescriptor ) {
797790 let url = event. paramDescriptor ( forKeyword: keyDirectObject) ? . stringValue
798791 processURL ( url)
@@ -987,6 +980,38 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
987980 NSApp . keyWindow? . close ( )
988981 }
989982
983+ func application( _ application: NSApplication , continue userActivity: NSUserActivity , restorationHandler: @escaping ( [ NSUserActivityRestoring ] ) -> Void ) -> Bool {
984+ if userActivity. activityType == CSSearchableItemActionType {
985+ if let uniqueIdentifier = userActivity. userInfo ? [ CSSearchableItemActivityIdentifier] as? String {
986+ if let identifier = parseSpotlightIdentifier ( uniqueIdentifier) {
987+ self . processSpotlightAction ( identifier)
988+ }
989+ }
990+ }
991+
992+ return true
993+ }
994+
995+ private func processSpotlightAction( _ identifier: SpotlightIdentifier ) {
996+ if let context = contextValue? . context {
997+ AppDelegate . spotlightAction = nil
998+ if context. account. id == identifier. recordId {
999+ switch identifier. source {
1000+ case let . peerId( peerId) :
1001+ context. sharedContext. bindings. rootNavigation ( ) . push ( ChatController ( context: context, chatLocation: . peer( peerId) ) )
1002+ }
1003+ } else {
1004+ switch identifier. source {
1005+ case let . peerId( peerId) :
1006+ context. sharedContext. switchToAccount ( id: identifier. recordId, action: . chat( peerId, necessary: true ) )
1007+ }
1008+ }
1009+ } else {
1010+ AppDelegate . spotlightAction = identifier
1011+ }
1012+
1013+ }
1014+
9901015 func getLogFilesContentWithMaxSize( ) -> String {
9911016
9921017 let semaphore = DispatchSemaphore ( value: 0 )
0 commit comments