Merge branch 'master' into ios

# Conflicts:
#	QuickDrop.xcodeproj/project.pbxproj
#	QuickDrop/AppDelegate.swift
#	QuickDrop/Localizable.xcstrings
#	ShareExtension/ShareViewController.swift
This commit is contained in:
Leon Böttger committed 2025-08-20 10:28:45 +02:00
commit cf6d45520f
8 files changed
+1572 -4362

No files matched your search

@@ -511,9 +511,11 @@ class InboundNearbyConnection: NearbyConnection {
#endif
filesToBeReceived[id]!.progress = progress
filesToBeReceived[id]!.created = true
log("[InboundNearbyConnection \(self.id)] Accepted file with size \(file.meta.size)")
}
let totalBytes = filesToBeReceived.values.reduce(0) { $0 + $1.meta.size }
let gigabytes = Double(totalBytes) / 1_000_000_000
log("[InboundNearbyConnection \(self.id)] Accepted \(filesToBeReceived.count) file(s) with size \(totalBytes) bytes (\(gigabytes) GB)")
var frame = Sharing_Nearby_Frame()
frame.version = .v1
@@ -207,8 +207,7 @@ class NearbyConnection {
log("[NearbyConnection \(self.id)] Connection closed by peer during receiveFrameAsync(length:)")
if let content = content, !content.isEmpty {
log("[NearbyConnection \(self.id)] Connection closed by peer during receiveFrameAsync(length:), but trying to process the frame anyway. Frame length: \(content.count)")
self.processReceivedFrame(frameData: content)
log("[NearbyConnection \(self.id)] Connection closed by peer during receiveFrameAsync(length:), and frame not empty. Frame length: \(content.count)")
}
else {
log("[NearbyConnection \(self.id)] Connection closed by peer during receiveFrameAsync(length:), but no content received anymore (\(String(describing: content))).")
@@ -424,7 +423,10 @@ class NearbyConnection {
}
else if offlineFrame.hasV1, offlineFrame.v1.hasType, case .keepAlive = offlineFrame.v1.type {
log("[NearbyConnection \(self.id)] Sent keep-alive, \(self.bytesTransferred) bytes sent")
let bytesTransferred = self.bytesTransferred
let gigabytesTransferred = Double(bytesTransferred) / 1_000_000_000
log("[NearbyConnection \(self.id)] Sent keep-alive, \(self.bytesTransferred) bytes (\(gigabytesTransferred) GB) sent")
sendKeepAlive(ack: true)
} else {