diff --git a/NearDrop/AppDelegate.swift b/NearDrop/AppDelegate.swift index 0168049..f77bb34 100644 --- a/NearDrop/AppDelegate.swift +++ b/NearDrop/AppDelegate.swift @@ -22,7 +22,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele var welcomeWindow: NSWindow? var plusWindow: NSWindow? - var alertWindow: NSWindow? + var firewallAlertWindow: NSWindow? + var apIsolationAlertWindow: NSWindow? + var networkFilterAlertWindow: NSWindow? private var iapManager: IAPManager? var showsFirewallAlert = false @@ -86,8 +88,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele } UNUserNotificationCenter.current().delegate=self - - //openFirewallAlert() } @@ -175,29 +175,43 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele plusWindow?.level = .normal } + enum AlertType: String { + case ApIsolation + case NetworkFilter + case Firewall + } - func openFirewallAlert() { - - // Create the welcome screen SwiftUI view - let firewallAlertView = FirewallIssueView() + func openAlert(type: AlertType) { // Create an NSWindow to host the SwiftUI view - alertWindow = NSWindow( + let alertWindow = NSWindow( contentRect: NSRect(x: 0, y: 0, width: issueViewWidth, height: issueViewHeight), styleMask: [.titled, .closable], backing: .buffered, defer: false ) - alertWindow?.center() - alertWindow?.isReleasedWhenClosed = false - alertWindow?.setFrameAutosaveName("FirewallAlert") - alertWindow?.contentView = NSHostingView(rootView: firewallAlertView) + switch type { + case .ApIsolation: + apIsolationAlertWindow = alertWindow + alertWindow.contentView = NSHostingView(rootView: ApIsolationIssueView()) + case .NetworkFilter: + networkFilterAlertWindow = alertWindow + alertWindow.contentView = NSHostingView(rootView: NetworkFilterIssueView()) + case .Firewall: + firewallAlertWindow = alertWindow + alertWindow.contentView = NSHostingView(rootView: FirewallIssueView()) + } + + alertWindow.title = "QuickDrop" + alertWindow.center() + alertWindow.isReleasedWhenClosed = false + alertWindow.setFrameAutosaveName(type.rawValue) NSApp.activate(ignoringOtherApps: true) - alertWindow?.makeKeyAndOrderFront(nil) - alertWindow?.level = .normal + alertWindow.makeKeyAndOrderFront(nil) + alertWindow.level = .normal } @@ -327,26 +341,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele func showFirewallAlert() { - - if !showsFirewallAlert { - showsFirewallAlert = true - - DispatchQueue.main.async { - let alert = NSAlert() - alert.alertStyle = .critical - - alert.messageText = "FirewallDetected".localized() - alert.informativeText = "FirewallDetectedDescription".localized() - - alert.addButton(withTitle: "CloseAlert".localized()) - - log("Showing alert with message: \"\(alert.messageText)\" and description: \"\(alert.informativeText)\"") - - let _ = alert.runModal() - - self.showsFirewallAlert = false - } - } + openAlert(type: .Firewall) } @@ -363,7 +358,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele case .protocolError(_): description = NSLocalizedString("Error.Protocol", value: "Communication error", comment: "") + "(\(ne.localizedDescription))" case .packetFilterError: - description = NSLocalizedString("Error.PacketFilter", value: "Communication error", comment: "") + openAlert(type: .NetworkFilter) + plusWindow?.close() + return case .requiredFieldMissing: description = NSLocalizedString("Error.Protocol", value: "Communication error", comment: "") + "(\(ne.localizedDescription))" case .ukey2: diff --git a/NearDrop/Base.lproj/Localizable.strings b/NearDrop/Base.lproj/Localizable.strings index 8dc4b3e..78056c1 100644 --- a/NearDrop/Base.lproj/Localizable.strings +++ b/NearDrop/Base.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Communication error"; -"Error.PacketFilter" = "Your Mac may have a faulty packet filter enabled. Open System Preferences > Network > VPN & Filter and disable the content filter to use QuickDrop."; -"FirewallDetected" = "Connection failed"; -"FirewallDetectedDescription" = "Your phone could not connect because a firewall is likely blocking incoming connections. Please allow QuickDrop in your firewall (or antivirus program) and try again."; -"AlertLearnMore" = "Learn more"; /* No comment provided by engineer. */ "NFiles" = "%d files"; diff --git a/NearDrop/IssueViews/ApIsolationIssueView.swift b/NearDrop/IssueViews/ApIsolationIssueView.swift index e262442..eb8aa5a 100644 --- a/NearDrop/IssueViews/ApIsolationIssueView.swift +++ b/NearDrop/IssueViews/ApIsolationIssueView.swift @@ -16,7 +16,7 @@ struct ApIsolationIssueView: View { var body: some View { - IssueView(image: .router, header: "Your router doesn't allow device-to-device communication", description: """ + IssueView(image: .router, header: "Your router might not allow device-to-device communication", description: """ QuickDrop has detected that your Wi-Fi router might block devices from talking to each other. To transfer files between your phone and your Mac, you’ll need to disable client isolation (also known as AP isolation or Wi-Fi isolation). Here’s how to disable it: diff --git a/NearDrop/IssueViews/FirewallIssueView.swift b/NearDrop/IssueViews/FirewallIssueView.swift index 9882f03..90c3dc5 100644 --- a/NearDrop/IssueViews/FirewallIssueView.swift +++ b/NearDrop/IssueViews/FirewallIssueView.swift @@ -14,7 +14,7 @@ struct FirewallIssueView: View { var body: some View { - IssueView(image: .firewall, header: "A firewall blocks incoming file transfers", description: """ + IssueView(image: .firewall, header: "A firewall might block incoming file transfers", description: """ QuickDrop has detected that a firewall prevents that your Android device can connect to your Mac. Firewalls are used to block incoming connections per default. For receiving files, it is required that incoming connections are allowed. This is because your phone tries to connect to your Mac – creating an incoming connection. You most likely use an antivirus program on your Mac. You have two options: diff --git a/NearDrop/IssueViews/IssueView.swift b/NearDrop/IssueViews/IssueView.swift index 642dda1..105e2cc 100644 --- a/NearDrop/IssueViews/IssueView.swift +++ b/NearDrop/IssueViews/IssueView.swift @@ -9,7 +9,7 @@ import SwiftUI import Foundation let issueViewWidth = 600.0 -let issueViewHeight = 300.0 +let issueViewHeight = 400.0 struct IssueView: View { diff --git a/NearDrop/IssueViews/NetworkFilterIssueView.swift b/NearDrop/IssueViews/NetworkFilterIssueView.swift index bc0473a..ac289db 100644 --- a/NearDrop/IssueViews/NetworkFilterIssueView.swift +++ b/NearDrop/IssueViews/NetworkFilterIssueView.swift @@ -14,7 +14,7 @@ struct NetworkFilterIssueView: View { var body: some View { - IssueView(image: .filter, header: "A packet filter prevents file transfer", description: """ + IssueView(image: .filter, header: "A packet filter might prevent file transfer", description: """ QuickDrop has detected that a program installed on your Mac modifies network traffic. As a result of that, the file you tried to send from your Android device could not be decrypted. Your Mac may have a faulty packet filter enabled, which might be installed by your antivirus program (e.g., ESET). Open System Preferences > Network > VPN & Filter and disable the content filter. diff --git a/NearDrop/ar.lproj/Localizable.strings b/NearDrop/ar.lproj/Localizable.strings index a2dffc2..95befe9 100644 --- a/NearDrop/ar.lproj/Localizable.strings +++ b/NearDrop/ar.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "خطأ في الاتصال"; -"Error.PacketFilter" = "قد يحتوي جهاز Mac الخاص بك على مرشح حزم معطّل. افتح تفضيلات النظام > الشبكة > VPN & التصفية، وقم بتعطيل مرشح المحتوى لاستخدام QuickDrop."; -"FirewallDetected" = "فشل الاتصال"; -"FirewallDetectedDescription" = "تعذر على هاتفك الاتصال، ومن المحتمل أن يكون جدار الحماية يحظر الاتصالات الواردة. يُرجى السماح لـ QuickDrop في جدار الحماية (أو برنامج مكافحة الفيروسات) ثم المحاولة مرة أخرى."; -"AlertLearnMore" = "اعرف المزيد"; /* No comment provided by engineer. */ "NFiles" = "%d ملفات"; diff --git a/NearDrop/de.lproj/Localizable.strings b/NearDrop/de.lproj/Localizable.strings index 438144c..928c170 100644 --- a/NearDrop/de.lproj/Localizable.strings +++ b/NearDrop/de.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Fehler bei der Datenübertragung"; -"Error.PacketFilter" = "Auf deinem Mac ist möglicherweise ein fehlerhafter Paketfilter aktiviert. Öffne Systemeinstellungen > Netzwerk > VPN & Filter und deaktiviere den Inhaltsfilter, um QuickDrop zu verwenden."; -"FirewallDetected" = "Verbindung fehlgeschlagen"; -"FirewallDetectedDescription" = "Dein Telefon konnte sich nicht verbinden, da vermutlich eine Firewall eingehende Verbindungen blockiert. Bitte erlaube QuickDrop in deiner Firewall (oder im Antivirenprogramm) und versuche es erneut."; -"AlertLearnMore" = "Mehr erfahren"; /* No comment provided by engineer. */ "NFiles" = "%d Dateien"; diff --git a/NearDrop/es.lproj/Localizable.strings b/NearDrop/es.lproj/Localizable.strings index 7d1a2ab..97471e5 100644 --- a/NearDrop/es.lproj/Localizable.strings +++ b/NearDrop/es.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Error de comunicación"; -"Error.PacketFilter" = "Es posible que tu Mac tenga activado un filtro de paquetes defectuoso. Abre Preferencias del Sistema > Red > VPN y Filtro y desactiva el filtro de contenido para usar QuickDrop."; -"FirewallDetected" = "Conexión fallida"; -"FirewallDetectedDescription" = "Tu teléfono no pudo conectarse porque probablemente un firewall está bloqueando las conexiones entrantes. Permite QuickDrop en el firewall (o en el antivirus) y vuelve a intentarlo."; -"AlertLearnMore" = "Más información"; /* No comment provided by engineer. */ //"NFiles" = "%d files"; diff --git a/NearDrop/fr.lproj/Localizable.strings b/NearDrop/fr.lproj/Localizable.strings index d5a4b94..a28c89f 100644 --- a/NearDrop/fr.lproj/Localizable.strings +++ b/NearDrop/fr.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Erreur de communication"; -"Error.PacketFilter" = "Votre Mac peut avoir un filtre de paquets défectueux activé. Ouvrez Réglages système > Réseau > VPN et filtre, puis désactivez le filtre de contenu pour utiliser QuickDrop."; -"FirewallDetected" = "Échec de la connexion"; -"FirewallDetectedDescription" = "Votre téléphone n’a pas pu se connecter, probablement parce qu’un pare-feu bloque les connexions entrantes. Autorisez QuickDrop dans votre pare-feu (ou programme antivirus) et réessayez."; -"AlertLearnMore" = "En savoir plus"; /* No comment provided by engineer. */ "NFiles" = "%d fichiers"; diff --git a/NearDrop/hu.lproj/Localizable.strings b/NearDrop/hu.lproj/Localizable.strings index d2c10d8..ab09b69 100644 --- a/NearDrop/hu.lproj/Localizable.strings +++ b/NearDrop/hu.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Kommunikációs hiba"; -"Error.PacketFilter" = "Lehet, hogy a Mac-ed hibás csomagszűrőt használ. Nyisd meg a Rendszerbeállítások > Hálózat > VPN és szűrő menüt, és kapcsold ki a tartalomszűrőt a QuickDrop használatához."; -"FirewallDetected" = "Sikertelen csatlakozás"; -"FirewallDetectedDescription" = "A telefon nem tudott csatlakozni, mert valószínűleg egy tűzfal blokkolja a bejövő kapcsolatokat. Engedélyezd a QuickDrop-ot a tűzfalban (vagy az antivírus programban), majd próbáld újra."; -"AlertLearnMore" = "További információ"; /* No comment provided by engineer. */ "NFiles" = "%d fájl"; diff --git a/NearDrop/it.lproj/Localizable.strings b/NearDrop/it.lproj/Localizable.strings index 2139ea1..abeb6c5 100644 --- a/NearDrop/it.lproj/Localizable.strings +++ b/NearDrop/it.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Errore di comunicazione"; -"Error.PacketFilter" = "Sul tuo Mac potrebbe essere attivo un filtro pacchetti difettoso. Apri Impostazioni di Sistema > Rete > VPN e Filtri e disattiva il filtro dei contenuti per utilizzare QuickDrop."; -"FirewallDetected" = "Connessione non riuscita"; -"FirewallDetectedDescription" = "Il telefono non è riuscito a connettersi perché probabilmente un firewall blocca le connessioni in entrata. Consenti QuickDrop nel firewall (o nel programma antivirus) e riprova."; -"AlertLearnMore" = "Scopri di più"; /* No comment provided by engineer. */ "NFiles" = "%d files"; diff --git a/NearDrop/ja.lproj/Localizable.strings b/NearDrop/ja.lproj/Localizable.strings index a8de9ca..dfe646e 100644 --- a/NearDrop/ja.lproj/Localizable.strings +++ b/NearDrop/ja.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "通信エラー"; -"Error.PacketFilter" = "お使いのMacで不具合のあるパケットフィルターが有効になっている可能性があります。システム設定 > ネットワーク > VPNとフィルターを開き、コンテンツフィルターを無効にしてQuickDropを使用してください。"; -"FirewallDetected" = "接続に失敗しました"; -"FirewallDetectedDescription" = "ファイアウォールが着信接続をブロックしている可能性があるため、スマートフォンが接続できませんでした。ファイアウォール（またはウイルス対策ソフト）で QuickDrop を許可して、もう一度お試しください。"; -"AlertLearnMore" = "詳しく見る"; /* No comment provided by engineer. */ "NFiles" = "%dつのファイル"; diff --git a/NearDrop/ko.lproj/Localizable.strings b/NearDrop/ko.lproj/Localizable.strings index fcdde19..5cb2e7f 100644 --- a/NearDrop/ko.lproj/Localizable.strings +++ b/NearDrop/ko.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "통신 오류"; -"Error.PacketFilter" = "Mac에서 오류가 있는 패킷 필터가 활성화되어 있을 수 있습니다. 시스템 설정 > 네트워크 > VPN 및 필터로 이동하여 콘텐츠 필터를 비활성화하면 QuickDrop을 사용할 수 있습니다."; -"FirewallDetected" = "연결 실패"; -"FirewallDetectedDescription" = "방화벽이 수신 연결을 차단하고 있어 휴대전화가 연결되지 않은 것 같습니다. 방화벽(또는 백신 프로그램)에서 QuickDrop을 허용한 후 다시 시도해 주세요."; -"AlertLearnMore" = "자세히 알아보기"; /* No comment provided by engineer. */ "NFiles" = "%d개의 파일"; diff --git a/NearDrop/nl.lproj/Localizable.strings b/NearDrop/nl.lproj/Localizable.strings index f2cb5ef..dcf9e53 100644 --- a/NearDrop/nl.lproj/Localizable.strings +++ b/NearDrop/nl.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Communicatiefout"; -"Error.PacketFilter" = "Je Mac heeft mogelijk een defect pakketfilter ingeschakeld. Open Systeemvoorkeuren > Netwerk > VPN & Filter en schakel het inhoudsfilter uit om QuickDrop te gebruiken."; -"FirewallDetected" = "Verbinding mislukt"; -"FirewallDetectedDescription" = "Je telefoon kon waarschijnlijk geen verbinding maken omdat een firewall inkomende verbindingen blokkeert. Sta QuickDrop toe in je firewall (of antivirusprogramma) en probeer het opnieuw."; -"AlertLearnMore" = "Meer informatie"; /* No comment provided by engineer. */ "NFiles" = "%d bestanden"; diff --git a/NearDrop/pt-BR.lproj/Localizable.strings b/NearDrop/pt-BR.lproj/Localizable.strings index eb0c6a1..a0ad227 100644 --- a/NearDrop/pt-BR.lproj/Localizable.strings +++ b/NearDrop/pt-BR.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Erro de comunicação"; -"Error.PacketFilter" = "O seu Mac pode ter um filtro de pacotes com defeito ativado. Abra Preferências do Sistema > Rede > VPN e Filtro e desative o filtro de conteúdo para usar o QuickDrop."; -"FirewallDetected" = "Falha na conexão"; -"FirewallDetectedDescription" = "Seu celular não conseguiu se conectar porque um firewall provavelmente está bloqueando conexões de entrada. Permita o QuickDrop no firewall (ou no antivírus) e tente novamente."; -"AlertLearnMore" = "Saiba mais"; /* No comment provided by engineer. */ "NFiles" = "%d arquivos"; diff --git a/NearDrop/pt-PT.lproj/Localizable.strings b/NearDrop/pt-PT.lproj/Localizable.strings index 7ce6c7e..9a25ab4 100644 --- a/NearDrop/pt-PT.lproj/Localizable.strings +++ b/NearDrop/pt-PT.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Erro de comunicação"; -"Error.PacketFilter" = "O seu Mac pode ter um filtro de pacotes com defeito ativado. Abra Preferências do Sistema > Rede > VPN e Filtro e desative o filtro de conteúdo para usar o QuickDrop."; -"FirewallDetected" = "Falha na ligação"; -"FirewallDetectedDescription" = "O seu telemóvel não conseguiu ligar-se porque um firewall poderá estar a bloquear ligações recebidas. Permita o QuickDrop no firewall (ou no programa antivírus) e tente novamente."; -"AlertLearnMore" = "Saber mais"; /* No comment provided by engineer. */ "NFiles" = "%d ficheiros"; diff --git a/NearDrop/ro.lproj/Localizable.strings b/NearDrop/ro.lproj/Localizable.strings index 17b4b85..d4e14ba 100644 --- a/NearDrop/ro.lproj/Localizable.strings +++ b/NearDrop/ro.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Eroare de comunicare"; -"Error.PacketFilter" = "Este posibil ca Mac-ul tău să aibă un filtru de pachete defect activat. Deschide Preferințe de sistem > Rețea > VPN și Filtru și dezactivează filtrul de conținut pentru a folosi QuickDrop."; -"FirewallDetected" = "Conexiune eșuată"; -"FirewallDetectedDescription" = "Telefonul tău nu s-a putut conecta deoarece este posibil ca un firewall să blocheze conexiunile primite. Permite QuickDrop în firewall (sau în programul antivirus) și încearcă din nou."; -"AlertLearnMore" = "Află mai multe"; /* No comment provided by engineer. */ "NFiles" = "%d fișiere"; diff --git a/NearDrop/ru.lproj/Localizable.strings b/NearDrop/ru.lproj/Localizable.strings index cee5571..14e06fe 100644 --- a/NearDrop/ru.lproj/Localizable.strings +++ b/NearDrop/ru.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Ошибка протокола"; -"Error.PacketFilter" = "На вашем Mac может быть включен неисправный фильтр пакетов. Откройте Системные настройки > Сеть > VPN и фильтры и отключите фильтр содержимого, чтобы использовать QuickDrop."; -"FirewallDetected" = "Не удалось подключиться"; -"FirewallDetectedDescription" = "Телефон не может подключиться, вероятно, из-за того что брандмауэр блокирует входящие соединения. Разрешите QuickDrop в брандмауэре (или антивирусной программе) и попробуйте снова."; -"AlertLearnMore" = "Подробнее"; /* No comment provided by engineer. */ /*"NFiles" = "%d файлов";*/ diff --git a/NearDrop/th.lproj/Localizable.strings b/NearDrop/th.lproj/Localizable.strings index 3f30c97..9ac69ae 100644 --- a/NearDrop/th.lproj/Localizable.strings +++ b/NearDrop/th.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "การสื่อสารผิดพลาด"; -"Error.PacketFilter" = "Mac ของคุณอาจเปิดใช้ตัวกรองแพ็กเกจที่มีปัญหาอยู่ เปิดการตั้งค่าระบบ > เครือข่าย > VPN และตัวกรอง แล้วปิดตัวกรองเนื้อหาเพื่อใช้งาน QuickDrop"; -"FirewallDetected" = "การเชื่อมต่อล้มเหลว"; -"FirewallDetectedDescription" = "โทรศัพท์ของคุณไม่สามารถเชื่อมต่อได้ เนื่องจากไฟร์วอลล์อาจบล็อกการเชื่อมต่อขาเข้า โปรดอนุญาต QuickDrop ในไฟร์วอลล์ (หรือโปรแกรมป้องกันไวรัส) แล้วลองอีกครั้ง"; -"AlertLearnMore" = "เรียนรู้เพิ่มเติม"; /* No comment provided by engineer. */ "NFiles" = "%d ไฟล์"; diff --git a/NearDrop/uk.lproj/Localizable.strings b/NearDrop/uk.lproj/Localizable.strings index 5513da0..55b4596 100644 --- a/NearDrop/uk.lproj/Localizable.strings +++ b/NearDrop/uk.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "Помилка протоколу"; -"Error.PacketFilter" = "На вашому Mac може бути ввімкнено несправний фільтр пакетів. Відкрийте Системні налаштування > Мережа > VPN і фільтр та вимкніть фільтр вмісту, щоб скористатися QuickDrop."; -"FirewallDetected" = "Помилка підключення"; -"FirewallDetectedDescription" = "Ймовірно, брандмауер блокує вхідні з’єднання, тому телефон не може підключитися. Дозвольте QuickDrop у брандмауері (або антивірусній програмі) і спробуйте знову."; -"AlertLearnMore" = "Дізнатися більше"; /* No comment provided by engineer. */ "NFiles" = "%d files"; diff --git a/NearDrop/zh-Hans.lproj/Localizable.strings b/NearDrop/zh-Hans.lproj/Localizable.strings index 50fc1b5..206fd0f 100644 --- a/NearDrop/zh-Hans.lproj/Localizable.strings +++ b/NearDrop/zh-Hans.lproj/Localizable.strings @@ -15,10 +15,6 @@ /* No comment provided by engineer. */ "Error.Protocol" = "通信出错"; -"Error.PacketFilter" = "你的 Mac 可能启用了有故障的数据包过滤器。请打开系统设置 > 网络 > VPN 与过滤器，并禁用内容过滤器以使用 QuickDrop。"; -"FirewallDetected" = "连接失败"; -"FirewallDetectedDescription" = "您的手机无法连接，可能是由于防火墙阻止了传入连接。请在防火墙（或杀毒软件）中允许 QuickDrop 然后重试。"; -"AlertLearnMore" = "了解更多"; /* No comment provided by engineer. */ "NFiles" = "%d files"; diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index bbacf97..916e76e 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -706,6 +706,8 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; @@ -725,6 +727,7 @@ MARKETING_VERSION = "${SHARED_VERSION}"; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -735,6 +738,8 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; @@ -754,6 +759,7 @@ MARKETING_VERSION = "${SHARED_VERSION}"; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -892,7 +898,8 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NearDrop/NearDrop.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; @@ -915,6 +922,7 @@ MARKETING_VERSION = "${SHARED_VERSION}"; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -929,7 +937,8 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NearDrop/NearDrop.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; @@ -952,6 +961,7 @@ MARKETING_VERSION = "${SHARED_VERSION}"; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0;