Skip to content

fix Context Menu #3972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 6 commits into from
Feb 3, 2026
+7 −46
Merged

fix Context Menu #3972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cef85d7
fix e2ee
marinofaggiana Feb 3, 2026
fa0892d
badge fix
marinofaggiana Feb 3, 2026
74a0dd8
remove FloatingPanel
marinofaggiana Feb 3, 2026
71ae31f
FloatingPanel removed
marinofaggiana Feb 3, 2026
d91c40d
fix
marinofaggiana Feb 3, 2026
87e3703
new build
marinofaggiana Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -3435,7 +3431,6 @@
F3F0419E2B9F7E7900D5155F /* RealmSwift */,
F37208A32BAB63EE006B5430 /* QRCodeReader */,
F37208A52BAB63EE006B5430 /* SwiftRichString */,
F37208A72BAB63EE006B5430 /* FloatingPanel */,
F37208A92BAB63EE006B5430 /* MarkdownKit */,
F37208AB2BAB63EE006B5430 /* SwiftEntryKit */,
F37208AD2BAB63EE006B5430 /* MarqueeLabel */,
Expand Down Expand Up @@ -3614,7 +3609,6 @@
packageProductDependencies = (
F7ED547B25EEA65400956C55 /* QRCodeReader */,
F72DA9B325F53E4E00B87DB1 /* SwiftRichString */,
F770768D263A8C3400A1BA94 /* FloatingPanel */,
F788ECC6263AAAFA00ADC67F /* MarkdownKit */,
F70B86742642CE3B00ED5349 /* FirebaseCrashlytics */,
F73ADD1B265546890069EA0D /* SwiftEntryKit */,
Expand Down Expand Up @@ -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" */,
Expand Down Expand Up @@ -5766,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;
Expand Down Expand Up @@ -5832,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;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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" */;
Expand Down Expand Up @@ -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" */;
Expand Down
10 changes: 2 additions & 8 deletions iOSClient/Menu/NCContextMenuMain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions iOSClient/Networking/NCNetworkingProcess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions iOSClient/Settings/Acknowledgements.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand Down
Loading