-
Notifications
You must be signed in to change notification settings - Fork 791
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6324 from nextcloud/work/fileprovider-xpc
Rewrite communication between client and File Provider extensions using XPC
- Loading branch information
Showing
20 changed files
with
816 additions
and
112 deletions.
There are no files selected for viewing
20 changes: 20 additions & 0 deletions
20
...integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExt-Bridging-Header.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * Copyright (C) 2023 by Claudio Cambra <claudio.cambra@nextcloud.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * for more details. | ||
| */ | ||
|
|
||
| #ifndef FileProviderExt_Bridging_Header_h | ||
| #define FileProviderExt_Bridging_Header_h | ||
|
|
||
| #import "Services/ClientCommunicationProtocol.h" | ||
|
|
||
| #endif /* FileProviderExt_Bridging_Header_h */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...ration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (C) 2023 by Claudio Cambra <claudio.cambra@nextcloud.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * for more details. | ||
| */ | ||
|
|
||
| #ifndef ClientCommunicationProtocol_h | ||
| #define ClientCommunicationProtocol_h | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @protocol ClientCommunicationProtocol | ||
|
|
||
| - (void)getExtensionAccountIdWithCompletionHandler:(void(^)(NSString *extensionAccountId, NSError *error))completionHandler; | ||
| - (void)configureAccountWithUser:(NSString *)user | ||
| serverUrl:(NSString *)serverUrl | ||
| password:(NSString *)password; | ||
| - (void)removeAccountConfig; | ||
|
|
||
| @end | ||
|
|
||
| #endif /* ClientCommunicationProtocol_h */ |
63 changes: 63 additions & 0 deletions
63
...ion/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationService.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright (C) 2023 by Claudio Cambra <claudio.cambra@nextcloud.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * for more details. | ||
| */ | ||
|
|
||
| import Foundation | ||
| import FileProvider | ||
| import OSLog | ||
|
|
||
| class ClientCommunicationService: NSObject, NSFileProviderServiceSource, NSXPCListenerDelegate, ClientCommunicationProtocol { | ||
| let listener = NSXPCListener.anonymous() | ||
| let serviceName = NSFileProviderServiceName("com.nextcloud.desktopclient.ClientCommunicationService") | ||
| let fpExtension: FileProviderExtension | ||
|
|
||
| init(fpExtension: FileProviderExtension) { | ||
| Logger.desktopClientConnection.debug("Instantiating client communication service") | ||
| self.fpExtension = fpExtension | ||
| super.init() | ||
| } | ||
|
|
||
| func makeListenerEndpoint() throws -> NSXPCListenerEndpoint { | ||
| listener.delegate = self | ||
| listener.resume() | ||
| return listener.endpoint | ||
| } | ||
|
|
||
| func listener(_ listener: NSXPCListener, shouldAcceptNewConnection newConnection: NSXPCConnection) -> Bool { | ||
| newConnection.exportedInterface = NSXPCInterface(with: ClientCommunicationProtocol.self) | ||
| newConnection.exportedObject = self | ||
| newConnection.resume() | ||
| return true | ||
| } | ||
|
|
||
| //MARK: - Client Communication Protocol methods | ||
|
|
||
| func getExtensionAccountId(completionHandler: @escaping (String?, Error?) -> Void) { | ||
| let accountUserId = self.fpExtension.domain.identifier.rawValue | ||
| Logger.desktopClientConnection.info("Sending extension account ID \(accountUserId, privacy: .public)") | ||
| completionHandler(accountUserId, nil) | ||
| } | ||
|
|
||
| func configureAccount(withUser user: String, | ||
| serverUrl: String, | ||
| password: String) { | ||
| Logger.desktopClientConnection.info("Received configure account information over client communication service") | ||
| self.fpExtension.setupDomainAccount(user: user, | ||
| serverUrl: serverUrl, | ||
| password: password) | ||
| } | ||
|
|
||
| func removeAccountConfig() { | ||
| self.fpExtension.removeAccountConfig() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationProtocol.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.