diff --git a/1_anytime.pxd/QuickLook/Icon.webp b/1_anytime.pxd/QuickLook/Icon.webp index 4fc3a85..e91cca5 100644 Binary files a/1_anytime.pxd/QuickLook/Icon.webp and b/1_anytime.pxd/QuickLook/Icon.webp differ diff --git a/1_anytime.pxd/QuickLook/Thumbnail.webp b/1_anytime.pxd/QuickLook/Thumbnail.webp index 0265c5d..e1514e1 100644 Binary files a/1_anytime.pxd/QuickLook/Thumbnail.webp and b/1_anytime.pxd/QuickLook/Thumbnail.webp differ diff --git a/1_anytime.pxd/metadata.info b/1_anytime.pxd/metadata.info index 1e33946..8d68759 100644 Binary files a/1_anytime.pxd/metadata.info and b/1_anytime.pxd/metadata.info differ diff --git a/2_copy.pxd/QuickLook/Icon.webp b/2_copy.pxd/QuickLook/Icon.webp index 74162d6..35f45ea 100644 Binary files a/2_copy.pxd/QuickLook/Icon.webp and b/2_copy.pxd/QuickLook/Icon.webp differ diff --git a/2_copy.pxd/QuickLook/Thumbnail.webp b/2_copy.pxd/QuickLook/Thumbnail.webp index bdd48b4..a1e782d 100644 Binary files a/2_copy.pxd/QuickLook/Thumbnail.webp and b/2_copy.pxd/QuickLook/Thumbnail.webp differ diff --git a/2_copy.pxd/data/908FEC10-FCFC-4D76-9CEB-DA7E7C4066E4 b/2_copy.pxd/data/908FEC10-FCFC-4D76-9CEB-DA7E7C4066E4 new file mode 100644 index 0000000..d1e6f7c Binary files /dev/null and b/2_copy.pxd/data/908FEC10-FCFC-4D76-9CEB-DA7E7C4066E4 differ diff --git a/2_copy.pxd/metadata.info b/2_copy.pxd/metadata.info index 51797ea..e2890de 100644 Binary files a/2_copy.pxd/metadata.info and b/2_copy.pxd/metadata.info differ diff --git a/NearDrop/AppDelegate.swift b/NearDrop/AppDelegate.swift index d3dd1e1..8d6c6d5 100644 --- a/NearDrop/AppDelegate.swift +++ b/NearDrop/AppDelegate.swift @@ -246,10 +246,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, MainAppDelegate{ guard let transfer = self.activeIncomingTransfers[id] else { return } if let error = error { - let alert = NSAlert() - alert.alertStyle = .critical - - alert.messageText = String(format: NSLocalizedString("TransferError", value: "Failed to receive files from %@", comment: ""), arguments: [transfer.device.name]) var description = "" if let ne = (error as? NearbyError){ @@ -269,7 +265,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, MainAppDelegate{ description = error.localizedDescription } + let alert = NSAlert() + alert.alertStyle = .critical + + alert.messageText = String(format: NSLocalizedString("TransferError", value: "Failed to receive files from %@", comment: ""), arguments: [transfer.device.name]) alert.informativeText = description + alert.addButton(withTitle: "TypeNotSupportedButton".localized()) + let _ = alert.runModal() } else { diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index e30abc2..78a587f 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -783,7 +783,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_BUILD = 19; + SHARED_BUILD = 20; SHARED_VERSION = 1.4.5; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -842,7 +842,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; - SHARED_BUILD = 19; + SHARED_BUILD = 20; SHARED_VERSION = 1.4.5; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/ShareExtension/ShareViewController.swift b/ShareExtension/ShareViewController.swift index f750907..815026f 100644 --- a/ShareExtension/ShareViewController.swift +++ b/ShareExtension/ShareViewController.swift @@ -354,7 +354,6 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{ alert.informativeText = "TimeoutDescription".localized() alert.addButton(withTitle: "TimeoutButton".localized()) - alert.beginSheetModal(for: self.view.window!) { _ in } } } @@ -394,15 +393,20 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{ DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { NearbyConnectionManager.shared.startDeviceDiscovery() self.isDiscovering = true + self.scheduleAutomaticQrCodeView() } } else { log("Main app is already running") NearbyConnectionManager.shared.startDeviceDiscovery() self.isDiscovering = true + self.scheduleAutomaticQrCodeView() } - - DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) { + } + + + private func scheduleAutomaticQrCodeView() { + DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { if self.foundDevices.isEmpty { self.openQrCodeView() }