Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extra init of Services in share extension

Browse Source
This commit is contained in:
Satindar Dhillon
2022-07-06 14:12:41 -07:00
parent d7370a579d
commit 16358bf230
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
View File

@ -56,7 +56,7 @@ extension ShareExtensionViewModel {
}
}
func createPage(services: Services, pageScrapePayload: PageScrapePayload) async -> Bool {
func createPage(pageScrapePayload: PageScrapePayload) async -> Bool {
var newRequestID: String?
do {
@ -112,7 +112,6 @@ extension ShareExtensionViewModel {
}
final class SaveOperation: Operation, URLSessionDelegate {
let services: Services
let pageScrapePayload: PageScrapePayload
let shareExtensionViewModel: ShareExtensionViewModel
@ -130,7 +129,6 @@ final class SaveOperation: Operation, URLSessionDelegate {
self.shareExtensionViewModel = shareExtensionViewModel
self.state = .created
self.services = Services()
}
public var state: State = .created {
@ -171,7 +169,6 @@ final class SaveOperation: Operation, URLSessionDelegate {
Task {
let pageCreated = await shareExtensionViewModel.createPage(
services: services,
pageScrapePayload: pageScrapePayload
)
if pageCreated {

5
apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionViewModel.swift
View File

@ -11,10 +11,7 @@ public class ShareExtensionViewModel: ObservableObject {
@Published public var requestId = UUID().uuidString.lowercased()
@Published var debugText: String?
#if os(macOS)
let services = Services()
#endif
let services = Services()
let queue = OperationQueue()
func handleReadNowAction(extensionContext: NSExtensionContext?) {

4
apple/OmnivoreKit/Sources/Services/Keychain/ValetKey.swift
View File

@ -6,6 +6,10 @@ public enum PublicValet {
public static var storedAppEnvironment: AppEnvironment? {
ValetKey.appEnvironmentString.value().flatMap { AppEnvironment(rawValue: $0) }
}
public static var authToken: String? {
ValetKey.authToken.value()
}
}
enum ValetKey: String {

5
apple/Sources/SafariExtension/SafariWebExtensionHandler.swift
View File

@ -8,15 +8,14 @@
import App
import os.log
import SafariServices
import Services
let SFExtensionMessageKey = "message"
class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
let services = Services()
func beginRequest(with context: NSExtensionContext) {
let response = NSExtensionItem()
let authToken = services.authenticator.authToken
let authToken = PublicValet.authToken
response.userInfo = [SFExtensionMessageKey: ["authToken": authToken]]
context.completeRequest(returningItems: [response], completionHandler: nil)
}