Refactoring

Fix Spanish translation: typos and improved consistency

NearDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,41 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "asn1",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/leif-ibsen/ASN1",
-      "state" : {
-        "revision" : "555922e06f1835863d4c0143eb00d0097bcfc707",
-        "version" : "2.0.3"
-      }
-    },
-    {
-      "identity" : "bigint",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/leif-ibsen/BigInt",
-      "state" : {
-        "revision" : "47903c6b2dd2cb3b4484d4524676a2ca8723a871",
-        "version" : "1.9.0"
-      }
-    },
-    {
-      "identity" : "swift-protobuf",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
-      "state" : {
-        "revision" : "0af9125c4eae12a4973fb66574c53a54962a9e1e",
-        "version" : "1.21.0"
-      }
-    },
-    {
-      "identity" : "swiftecc",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/leif-ibsen/SwiftECC",
-      "state" : {
-        "revision" : "55493f0609f07b24bf6cd52b90898ed1cefb268e",
-        "version" : "3.5.3"
-      }
-    }
-  ],
-  "version" : 2
-}

NearDrop/AppDelegate.swift

@@ -1,140 +0,0 @@
-//
-//  AppDelegate.swift
-//  NearDrop
-//
-//  Created by Grishka on 08.04.2023.
-//
-
-import Cocoa
-import UserNotifications
-import NearbyShare
-
-@main
-class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDelegate, MainAppDelegate{
-	private var statusItem:NSStatusItem?
-	private var activeIncomingTransfers:[String:TransferInfo]=[:]
-
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-		let menu=NSMenu()
-		menu.addItem(withTitle: NSLocalizedString("VisibleToEveryone", value: "Visible to everyone", comment: ""), action: nil, keyEquivalent: "")
-		menu.addItem(withTitle: String(format: NSLocalizedString("DeviceName", value: "Device name: %@", comment: ""), arguments: [Host.current().localizedName!]), action: nil, keyEquivalent: "")
-		menu.addItem(NSMenuItem.separator())
-		menu.addItem(withTitle: NSLocalizedString("Quit", value: "Quit NearDrop", comment: ""), action: #selector(NSApplication.terminate(_:)), keyEquivalent: "")
-		statusItem=NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-		statusItem?.button?.image=NSImage(named: "MenuBarIcon")
-		statusItem?.menu=menu
-		statusItem?.behavior = .removalAllowed
-		
-		let nc=UNUserNotificationCenter.current()
-		nc.requestAuthorization(options: [.alert, .sound]) { granted, err in
-			if !granted{
-				DispatchQueue.main.async {
-					self.showNotificationsDeniedAlert()
-				}
-			}
-		}
-		nc.delegate=self
-		let incomingTransfersCategory=UNNotificationCategory(identifier: "INCOMING_TRANSFERS", actions: [
-			UNNotificationAction(identifier: "ACCEPT", title: NSLocalizedString("Accept", comment: ""), options: UNNotificationActionOptions.authenticationRequired),
-			UNNotificationAction(identifier: "DECLINE", title: NSLocalizedString("Decline", comment: ""))
-		], intentIdentifiers: [])
-		let errorsCategory=UNNotificationCategory(identifier: "ERRORS", actions: [], intentIdentifiers: [])
-		nc.setNotificationCategories([incomingTransfersCategory, errorsCategory])
-		NearbyConnectionManager.shared.mainAppDelegate=self
-		NearbyConnectionManager.shared.becomeVisible()
-	}
-	
-	func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
-		statusItem?.isVisible=true
-		return true
-	}
-
-    func applicationWillTerminate(_ aNotification: Notification) {
-		UNUserNotificationCenter.current().removeAllDeliveredNotifications()
-    }
-
-    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
-        return true
-    }
-	
-	func showNotificationsDeniedAlert(){
-		let alert=NSAlert()
-		alert.alertStyle = .critical
-		alert.messageText=NSLocalizedString("NotificationsDenied.Title", value: "Notification Permission Required", comment: "")
-		alert.informativeText=NSLocalizedString("NotificationsDenied.Message", value: "NearDrop needs to be able to display notifications for incoming file transfers. Please allow notifications in System Settings.", comment: "")
-		alert.addButton(withTitle: NSLocalizedString("NotificationsDenied.OpenSettings", value: "Open settings", comment: ""))
-		alert.addButton(withTitle: NSLocalizedString("Quit", value: "Quit NearDrop", comment: ""))
-		let result=alert.runModal()
-		if result==NSApplication.ModalResponse.alertFirstButtonReturn{
-			NSWorkspace.shared.open(URL(string: "x-apple.systempreferences:com.apple.preference.notifications")!)
-		}else if result==NSApplication.ModalResponse.alertSecondButtonReturn{
-			NSApplication.shared.terminate(nil)
-		}
-	}
-	
-	func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-		let transferID=response.notification.request.content.userInfo["transferID"]! as! String
-		NearbyConnectionManager.shared.submitUserConsent(transferID: transferID, accept: response.actionIdentifier=="ACCEPT")
-		if response.actionIdentifier != "ACCEPT"{
-			activeIncomingTransfers.removeValue(forKey: transferID)
-		}
-		completionHandler()
-	}
-	
-	func obtainUserConsent(for transfer: TransferMetadata, from device: RemoteDeviceInfo) {
-		let fileStr:String
-		if let textTitle=transfer.textDescription{
-			fileStr=textTitle
-		}else if transfer.files.count==1{
-			fileStr=transfer.files[0].name
-		}else{
-			fileStr=String.localizedStringWithFormat(NSLocalizedString("NFiles", value: "%d files", comment: ""), transfer.files.count)
-		}
-		let notificationContent=UNMutableNotificationContent()
-		notificationContent.title="NearDrop"
-		notificationContent.subtitle=String(format:NSLocalizedString("PinCode", value: "PIN: %@", comment: ""), arguments: [transfer.pinCode!])
-		notificationContent.body=String(format: NSLocalizedString("DeviceSendingFiles", value: "%1$@ is sending you %2$@", comment: ""), arguments: [device.name, fileStr])
-		notificationContent.sound = .default
-		notificationContent.categoryIdentifier="INCOMING_TRANSFERS"
-		notificationContent.userInfo=["transferID": transfer.id]
-		if #available(macOS 11.0, *){
-			NDNotificationCenterHackery.removeDefaultAction(notificationContent)
-		}
-		let notificationReq=UNNotificationRequest(identifier: "transfer_"+transfer.id, content: notificationContent, trigger: nil)
-		UNUserNotificationCenter.current().add(notificationReq)
-		self.activeIncomingTransfers[transfer.id]=TransferInfo(device: device, transfer: transfer)
-	}
-	
-	func incomingTransfer(id: String, didFinishWith error: Error?) {
-		guard let transfer=self.activeIncomingTransfers[id] else {return}
-		if let error=error{
-			let notificationContent=UNMutableNotificationContent()
-			notificationContent.title=String(format: NSLocalizedString("TransferError", value: "Failed to receive files from %@", comment: ""), arguments: [transfer.device.name])
-			if let ne=(error as? NearbyError){
-				switch ne{
-				case .inputOutput:
-					notificationContent.body="I/O Error";
-				case .protocolError(_):
-					notificationContent.body=NSLocalizedString("Error.Protocol", value: "Communication error", comment: "")
-				case .requiredFieldMissing:
-					notificationContent.body=NSLocalizedString("Error.Protocol", value: "Communication error", comment: "")
-				case .ukey2:
-					notificationContent.body=NSLocalizedString("Error.Crypto", value: "Encryption error", comment: "")
-				case .canceled(reason: _):
-					break; // can't happen for incoming transfers
-				}
-			}else{
-				notificationContent.body=error.localizedDescription
-			}
-			notificationContent.categoryIdentifier="ERRORS"
-			UNUserNotificationCenter.current().add(UNNotificationRequest(identifier: "transferError_"+id, content: notificationContent, trigger: nil))
-		}
-		UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: ["transfer_"+id])
-		self.activeIncomingTransfers.removeValue(forKey: id)
-	}
-}
-
-struct TransferInfo{
-	let device:RemoteDeviceInfo
-	let transfer:TransferMetadata
-}

NearDrop/Base.lproj/Localizable.strings

@@ -1,42 +0,0 @@
-/* No comment provided by engineer. */
-"Accept" = "Accept";
-
-/* No comment provided by engineer. */
-"Decline" = "Decline";
-
-/* No comment provided by engineer. */
-"DeviceName" = "Device name: %@";
-
-/* No comment provided by engineer. */
-"DeviceSendingFiles" = "%1$@ is sending you %2$@";
-
-/* No comment provided by engineer. */
-"Error.Crypto" = "Encryption error";
-
-/* No comment provided by engineer. */
-"Error.Protocol" = "Communication error";
-
-/* No comment provided by engineer. */
-"NFiles" = "%d files";
-
-/* No comment provided by engineer. */
-"NotificationsDenied.Message" = "NearDrop needs to be able to display notifications for incoming file transfers. Please allow notifications in System Settings.";
-
-/* No comment provided by engineer. */
-"NotificationsDenied.OpenSettings" = "Open settings";
-
-/* No comment provided by engineer. */
-"NotificationsDenied.Title" = "Notification Permission Required";
-
-/* No comment provided by engineer. */
-"PinCode" = "PIN: %@";
-
-/* No comment provided by engineer. */
-"Quit" = "Quit NearDrop";
-
-/* No comment provided by engineer. */
-"TransferError" = "Failed to receive files from %@";
-
-/* No comment provided by engineer. */
-"VisibleToEveryone" = "Visible to everyone";
-

NearDrop/NDNotificationCenterHackery.h

@@ -1,19 +0,0 @@
-//
-//  NDNotificationCenterHackery.h
-//  NearDrop
-//
-//  Created by Grishka on 10.04.2023.
-//
-
-#import <Foundation/Foundation.h>
-#import <UserNotifications/UserNotifications.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NDNotificationCenterHackery : NSObject
-
-+ (void)removeDefaultAction:(UNMutableNotificationContent*) content;
-
-@end
-
-NS_ASSUME_NONNULL_END

NearDrop/NDNotificationCenterHackery.m

@@ -1,42 +0,0 @@
-//
-//  NDNotificationCenterHackery.m
-//  NearDrop
-//
-//  Created by Grishka on 10.04.2023.
-//
-
-#import <UserNotifications/UserNotifications.h>
-#import <AppKit/AppKit.h>
-#import "NDNotificationCenterHackery.h"
-
-@interface UNMutableNotificationCategory : UNNotificationCategory
-@property(copy) NSString *actionsMenuTitle;
-@property(copy) UNNotificationAction *alternateAction;
-@property(copy) NSArray *minimalActions;
-@property unsigned long long backgroundStyle;
-@property(copy) NSArray *actions;
-@end
-
-@interface UNNotificationIcon : NSObject
-+ (id)iconForApplicationIdentifier:(id)arg1;
-+ (id)iconAtPath:(id)arg1;
-+ (id)iconNamed:(id)arg1;
-@end
-
-@interface UNMutableNotificationContent (NDPrivateAPIs)
-@property BOOL hasDefaultAction;
-@property(copy) NSString *defaultActionTitle;
-@property(copy) NSString *header;
-@property (assign,nonatomic) BOOL shouldDisplayActionsInline;
-@property (assign,nonatomic) BOOL shouldShowSubordinateIcon;
-@property (nonatomic,copy) NSString * accessoryImageName;
-@property(copy) UNNotificationIcon *icon;
-@end
-
-@implementation NDNotificationCenterHackery
-
-+ (void)removeDefaultAction:(UNMutableNotificationContent*) content{
-	content.hasDefaultAction=false;
-}
-
-@end