From cef85d7901088761936b539d6814550770dcd200 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 14:07:24 +0100 Subject: [PATCH 1/6] fix e2ee Signed-off-by: Marino Faggiana --- iOSClient/Menu/NCContextMenuMain.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOSClient/Menu/NCContextMenuMain.swift b/iOSClient/Menu/NCContextMenuMain.swift index e27d4f9441..a83715ed24 100644 --- a/iOSClient/Menu/NCContextMenuMain.swift +++ b/iOSClient/Menu/NCContextMenuMain.swift @@ -417,7 +417,7 @@ class NCContextMenuMain: NSObject { ) if metadata.directory { - if !metadata.isDirectoryE2EE && !metadata.e2eEncrypted { + if !metadata.isDirectoryE2EE && metadata.e2eEncrypted { deleteMenu.append(deleteSubMenu) } } else { From fa0892d8769105091cec24ec75cf03638b1791eb Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 14:22:52 +0100 Subject: [PATCH 2/6] badge fix Signed-off-by: Marino Faggiana --- iOSClient/Networking/NCNetworkingProcess.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iOSClient/Networking/NCNetworkingProcess.swift b/iOSClient/Networking/NCNetworkingProcess.swift index 70a6169017..992f25c24b 100644 --- a/iOSClient/Networking/NCNetworkingProcess.swift +++ b/iOSClient/Networking/NCNetworkingProcess.swift @@ -61,6 +61,9 @@ actor NCNetworkingProcess { guard let self else { return } Task { + let count = await self.inWaitingCount() + try? await UNUserNotificationCenter.current().setBadgeCount(count) + await self.stopTimer() await self.cancelCurrentTaskOnBackground() await self.cancelCurrentUpload() @@ -197,8 +200,6 @@ actor NCNetworkingProcess { if count != inWaitingCount { inWaitingCount = count Task { @MainActor in - UNUserNotificationCenter.current().setBadgeCount(count) - if let controller = getRootController(), let files = controller.tabBar.items?.first { files.badgeValue = count == 0 ? nil : self.utility.formatBadgeCount(count) From 74a0dd80d917f3699efb6e69de30183ce8a1a723 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 14:25:09 +0100 Subject: [PATCH 3/6] remove FloatingPanel Signed-off-by: Marino Faggiana --- Nextcloud.xcodeproj/project.pbxproj | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 8978c84eb7..56b67be7e8 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -126,7 +126,6 @@ F37208812BAB5979006B5430 /* TestConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = F37208742BAB4AB0006B5430 /* TestConstants.swift */; }; F37208A42BAB63EE006B5430 /* QRCodeReader in Frameworks */ = {isa = PBXBuildFile; productRef = F37208A32BAB63EE006B5430 /* QRCodeReader */; }; F37208A62BAB63EE006B5430 /* SwiftRichString in Frameworks */ = {isa = PBXBuildFile; productRef = F37208A52BAB63EE006B5430 /* SwiftRichString */; }; - F37208A82BAB63EE006B5430 /* FloatingPanel in Frameworks */ = {isa = PBXBuildFile; productRef = F37208A72BAB63EE006B5430 /* FloatingPanel */; }; F37208AA2BAB63EE006B5430 /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = F37208A92BAB63EE006B5430 /* MarkdownKit */; }; F37208AC2BAB63EE006B5430 /* SwiftEntryKit in Frameworks */ = {isa = PBXBuildFile; productRef = F37208AB2BAB63EE006B5430 /* SwiftEntryKit */; }; F37208AE2BAB63EE006B5430 /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = F37208AD2BAB63EE006B5430 /* MarqueeLabel */; }; @@ -526,7 +525,6 @@ F76DEE9928F808AF0041B1C9 /* LockscreenWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76DEE9628F808AF0041B1C9 /* LockscreenWidgetView.swift */; }; F7707687263A853700A1BA94 /* NCContentPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F765608E23BF813500765969 /* NCContentPresenter.swift */; }; F770768A263A8A2500A1BA94 /* NCUtilityFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74AF3A3247FB6AE00AC767B /* NCUtilityFileSystem.swift */; }; - F770768E263A8C3400A1BA94 /* FloatingPanel in Frameworks */ = {isa = PBXBuildFile; productRef = F770768D263A8C3400A1BA94 /* FloatingPanel */; }; F771E3D320E2392D00AFB62D /* FileProviderExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F771E3D220E2392D00AFB62D /* FileProviderExtension.swift */; }; F771E3D520E2392D00AFB62D /* FileProviderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = F771E3D420E2392D00AFB62D /* FileProviderItem.swift */; }; F771E3D720E2392D00AFB62D /* FileProviderEnumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F771E3D620E2392D00AFB62D /* FileProviderEnumerator.swift */; }; @@ -1841,7 +1839,6 @@ files = ( F37208C42BAB63F0006B5430 /* Gzip in Frameworks */, F37208B02BAB63EF006B5430 /* Queuer in Frameworks */, - F37208A82BAB63EE006B5430 /* FloatingPanel in Frameworks */, F3F0419F2B9F7E7900D5155F /* RealmSwift in Frameworks */, F37208C82BAB63F1006B5430 /* KeychainAccess in Frameworks */, F37208A62BAB63EE006B5430 /* SwiftRichString in Frameworks */, @@ -1950,7 +1947,6 @@ F33EE6F02BF4C0FF00CA1A51 /* NIO in Frameworks */, F3A0479E2BD268B500658E7B /* PopupView in Frameworks */, F3374AF82D78B01B002A38F9 /* HeapModule in Frameworks */, - F770768E263A8C3400A1BA94 /* FloatingPanel in Frameworks */, F77333882927A72100466E35 /* OpenSSL in Frameworks */, F753BA93281FD8020015BFB6 /* EasyTipView in Frameworks */, F70557B72ED44E2700135623 /* LucidBanner in Frameworks */, @@ -3435,7 +3431,6 @@ F3F0419E2B9F7E7900D5155F /* RealmSwift */, F37208A32BAB63EE006B5430 /* QRCodeReader */, F37208A52BAB63EE006B5430 /* SwiftRichString */, - F37208A72BAB63EE006B5430 /* FloatingPanel */, F37208A92BAB63EE006B5430 /* MarkdownKit */, F37208AB2BAB63EE006B5430 /* SwiftEntryKit */, F37208AD2BAB63EE006B5430 /* MarqueeLabel */, @@ -3614,7 +3609,6 @@ packageProductDependencies = ( F7ED547B25EEA65400956C55 /* QRCodeReader */, F72DA9B325F53E4E00B87DB1 /* SwiftRichString */, - F770768D263A8C3400A1BA94 /* FloatingPanel */, F788ECC6263AAAFA00ADC67F /* MarkdownKit */, F70B86742642CE3B00ED5349 /* FirebaseCrashlytics */, F73ADD1B265546890069EA0D /* SwiftEntryKit */, @@ -3803,7 +3797,6 @@ F75E57A725BF0D61002B72C2 /* XCRemoteSwiftPackageReference "SVGKit" */, F7ED547A25EEA65400956C55 /* XCRemoteSwiftPackageReference "QRCodeReader" */, F72DA9B225F53E4E00B87DB1 /* XCRemoteSwiftPackageReference "SwiftRichString" */, - F770768C263A8C3400A1BA94 /* XCRemoteSwiftPackageReference "FloatingPanel" */, F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */, F70B86732642CE3B00ED5349 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, F73ADD1A265546880069EA0D /* XCRemoteSwiftPackageReference "SwiftEntryKit" */, @@ -6109,14 +6102,6 @@ kind = branch; }; }; - F770768C263A8C3400A1BA94 /* XCRemoteSwiftPackageReference "FloatingPanel" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/scenee/FloatingPanel"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 3.0.0; - }; - }; F77333862927A72100466E35 /* XCRemoteSwiftPackageReference "OpenSSL" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/krzyzanowskim/OpenSSL"; @@ -6293,11 +6278,6 @@ package = F72DA9B225F53E4E00B87DB1 /* XCRemoteSwiftPackageReference "SwiftRichString" */; productName = SwiftRichString; }; - F37208A72BAB63EE006B5430 /* FloatingPanel */ = { - isa = XCSwiftPackageProductDependency; - package = F770768C263A8C3400A1BA94 /* XCRemoteSwiftPackageReference "FloatingPanel" */; - productName = FloatingPanel; - }; F37208A92BAB63EE006B5430 /* MarkdownKit */ = { isa = XCSwiftPackageProductDependency; package = F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */; @@ -6568,11 +6548,6 @@ package = F76DA967277B77E90082465B /* XCRemoteSwiftPackageReference "DropDown" */; productName = DropDown; }; - F770768D263A8C3400A1BA94 /* FloatingPanel */ = { - isa = XCSwiftPackageProductDependency; - package = F770768C263A8C3400A1BA94 /* XCRemoteSwiftPackageReference "FloatingPanel" */; - productName = FloatingPanel; - }; F77333872927A72100466E35 /* OpenSSL */ = { isa = XCSwiftPackageProductDependency; package = F77333862927A72100466E35 /* XCRemoteSwiftPackageReference "OpenSSL" */; From 71ae31f44cea01f09ccdfb5f66e8d855d1dc837f Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 14:29:53 +0100 Subject: [PATCH 4/6] FloatingPanel removed Signed-off-by: Marino Faggiana --- iOSClient/Settings/Acknowledgements.rtf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/iOSClient/Settings/Acknowledgements.rtf b/iOSClient/Settings/Acknowledgements.rtf index 65cecead34..6099e562a9 100644 --- a/iOSClient/Settings/Acknowledgements.rtf +++ b/iOSClient/Settings/Acknowledgements.rtf @@ -153,15 +153,6 @@ Copyright (c) Daniel Huri, huri000@gmail.com\ __________________________________\ \ -\f1\b FloatingPanel -\f0\b0 \ -\ -MIT License\ -\ -Copyright (c) Shin Yamamoto shin@scenee.com\ -__________________________________\ -\ - \f1\b MarkdownKit \f0\b0 \ \ From d91c40db4c7aa0b973b5a9e21169ee2e91cd1317 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 15:55:13 +0100 Subject: [PATCH 5/6] fix Signed-off-by: Marino Faggiana --- iOSClient/Menu/NCContextMenuMain.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/iOSClient/Menu/NCContextMenuMain.swift b/iOSClient/Menu/NCContextMenuMain.swift index a83715ed24..0f1aaf9cf8 100644 --- a/iOSClient/Menu/NCContextMenuMain.swift +++ b/iOSClient/Menu/NCContextMenuMain.swift @@ -416,14 +416,8 @@ class NCContextMenuMain: NSObject { children: [deleteConfirmLocal, deleteConfirmFile] ) - if metadata.directory { - if !metadata.isDirectoryE2EE && metadata.e2eEncrypted { - deleteMenu.append(deleteSubMenu) - } - } else { - if !metadata.lock { - deleteMenu.append(deleteSubMenu) - } + if metadata.isDeletable { + deleteMenu.append(deleteSubMenu) } return deleteMenu From 87e3703efb3c0e455a2b1717dfd1acef54f5fe99 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Feb 2026 15:59:26 +0100 Subject: [PATCH 6/6] new build Signed-off-by: Marino Faggiana --- Nextcloud.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 56b67be7e8..c729b04adb 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -5759,7 +5759,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = NKUJUXUJ3B; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -5825,7 +5825,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = NKUJUXUJ3B; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES;