Skip to content

feat: add document editor coordinator #4237

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 7 commits into from
Aug 8, 2026
Merged

feat: add document editor coordinator #4237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d583705
feat: add document editor coordinator
marinofaggiana Aug 7, 2026
2c609a3
feat: support text and EuroOffice document editors
marinofaggiana Aug 7, 2026
ae560a0
refactor: centralize document editor selection
marinofaggiana Aug 7, 2026
2db7664
refactor: migrate to renamed editor capabilities API
marinofaggiana Aug 7, 2026
228e76e
fix: support OnlyOffice in document editor flows
marinofaggiana Aug 7, 2026
1958102
chore: bump build number and pin NextcloudKit 7.4.2
marinofaggiana Aug 7, 2026
cddf8df
chore: bump project build number to 3
marinofaggiana Aug 7, 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
18 changes: 15 additions & 3 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@
F7C7B25028B8AD4500E7115D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
F7C7B25128B8B0C400E7115D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7F67BB81A24D27800EE80DA /* Images.xcassets */; };
F7C7B489245EBA4100D93E60 /* NCViewerQuickLook.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C7B488245EBA4100D93E60 /* NCViewerQuickLook.swift */; };
F7C8A93A3025B757004E3A10 /* NCDocumentEditorCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C8A9393025B74B004E3A10 /* NCDocumentEditorCoordinator.swift */; };
F7C9555321F0C4CA0024296E /* NCActivity.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7C9555221F0C4CA0024296E /* NCActivity.storyboard */; };
F7C9555521F0C5470024296E /* NCActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9555421F0C5470024296E /* NCActivity.swift */; };
F7C9739528F17131002C43E2 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9739428F17131002C43E2 /* IntentHandler.swift */; };
Expand Down Expand Up @@ -1840,6 +1841,7 @@
F7C630832FFF6DDF00257EEB /* NCMetadataDownloadTranfersSuccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMetadataDownloadTranfersSuccess.swift; sourceTree = "<group>"; };
F7C687E82D22BD46004757BC /* NCManageDatabase+RecommendedFiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+RecommendedFiles.swift"; sourceTree = "<group>"; };
F7C7B488245EBA4100D93E60 /* NCViewerQuickLook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerQuickLook.swift; sourceTree = "<group>"; };
F7C8A9393025B74B004E3A10 /* NCDocumentEditorCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCDocumentEditorCoordinator.swift; sourceTree = "<group>"; };
F7C9555221F0C4CA0024296E /* NCActivity.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCActivity.storyboard; sourceTree = "<group>"; };
F7C9555421F0C5470024296E /* NCActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivity.swift; sourceTree = "<group>"; };
F7C9739028F17131002C43E2 /* WidgetDashboardIntentHandler.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetDashboardIntentHandler.appex; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -3024,6 +3026,7 @@
children = (
F7F9D1BA25397CE000D9BFF5 /* NCViewer.swift */,
F7EFA47725ADBA500083159A /* NCViewerProviderContextMenu.swift */,
F7C8A93B3025BCBC004E3A10 /* NCViewerDocument */,
F7CDB5C12FA33CA300F72306 /* NCViewerMedia */,
F723986A253C9C0E00257F49 /* NCViewerQuickLook */,
F76D3CEF2428B3DD005DFA87 /* NCViewerPDF */,
Expand Down Expand Up @@ -3285,6 +3288,14 @@
path = "Action Assistant";
sourceTree = "<group>";
};
F7C8A93B3025BCBC004E3A10 /* NCViewerDocument */ = {
isa = PBXGroup;
children = (
F7C8A9393025B74B004E3A10 /* NCDocumentEditorCoordinator.swift */,
);
path = NCViewerDocument;
sourceTree = "<group>";
};
F7C9739328F17131002C43E2 /* WidgetDashboardIntentHandler */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4807,6 +4818,7 @@
files = (
F77444F522281649000D5EB0 /* NCMediaCell.swift in Sources */,
F78C6FDE296D677300C952C3 /* NCContextMenuMain.swift in Sources */,
F7C8A93A3025B757004E3A10 /* NCDocumentEditorCoordinator.swift in Sources */,
A5A87F9E4B0E4441A6A4BC20 /* NCContextMenuProfile.swift in Sources */,
CB3666201AF7550816B5CD6A /* NCContextMenuComment.swift in Sources */,
F7E402332BA89551007E5609 /* NCTrash+Networking.swift in Sources */,
Expand Down Expand Up @@ -6311,7 +6323,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = NKUJUXUJ3B;
Expand Down Expand Up @@ -6379,7 +6391,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = NKUJUXUJ3B;
Expand Down Expand Up @@ -6649,7 +6661,7 @@
repositoryURL = "https://github.com/nextcloud/NextcloudKit";
requirement = {
kind = exactVersion;
version = 7.4.1;
version = 7.4.2;
};
};
F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Data/NCManageDatabase+Capabilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ extension NCManageDatabase {
capabilities = await NKCapabilities.shared.getCapabilities(for: account)
}

capabilities?.directEditingEditors = editors
capabilities?.directEditingCreators = creators
capabilities?.editorEditors = editors
capabilities?.editorCreators = creators

if let capabilities {
await NKCapabilities.shared.setCapabilities(for: account, capabilities: capabilities)
Expand Down
8 changes: 4 additions & 4 deletions iOSClient/Data/NCManageDatabase+Metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,17 +248,17 @@ extension tableMetadata {
return false
}
let utility = NCUtility()
let directEditingEditors = utility.editorsDirectEditing(account: account, contentType: contentType).map { $0.lowercased() }
let editorsEditing = utility.editorsEditing(account: account, contentType: contentType).map { $0.lowercased() }
let richDocumentEditor = utility.isTypeFileRichDocument(self)
let capabilities = NCNetworking.shared.capabilities[account]

if let capabilities,
capabilities.richDocumentsEnabled,
richDocumentEditor,
directEditingEditors.isEmpty {
editorsEditing.isEmpty {
// RichDocument: Collabora
return true
} else if !directEditingEditors.isEmpty {
} else if !editorsEditing.isEmpty {
return true
}
return false
Expand All @@ -280,7 +280,7 @@ extension tableMetadata {
guard (classFile == NKTypeClassFile.document.rawValue) && NextcloudKit.shared.isNetworkReachable() else {
return false
}
let editors = NCUtility().editorsDirectEditing(account: account, contentType: contentType)
let editors = NCUtility().editorsEditing(account: account, contentType: contentType)
return !editors.isEmpty
}

Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Menu/NCContextMenuMain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class NCContextMenuMain: NSObject {
}

if metadata.isAvailableDirectEditingEditorView {
let availableEditors = utility.editorsDirectEditing(
let availableEditors = utility.editorsEditing(
account: metadata.account,
contentType: metadata.contentType
).map { $0.lowercased() }
Expand Down
Loading
Loading