From 0225d5003f58a23dfb0671a0e513df41a33a0f7e Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 12 Sep 2019 11:24:43 -0500 Subject: [PATCH] add error handling to share extension --- iOS/ShareExtension/ShareViewController.swift | 12 +++++++----- submodules/RSCore | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/iOS/ShareExtension/ShareViewController.swift b/iOS/ShareExtension/ShareViewController.swift index 7e8bcfbf0..1e5ef2642 100644 --- a/iOS/ShareExtension/ShareViewController.swift +++ b/iOS/ShareExtension/ShareViewController.swift @@ -20,6 +20,8 @@ class ShareViewController: SLComposeServiceViewController { override func viewDidLoad() { + AccountManager.shared = AccountManager(accountsFolder: RSDataSubfolder(nil, "Accounts")!) + title = "NetNewsWire" placeholder = "Feed Name (Optional)" if let button = navigationController?.navigationBar.topItem?.rightBarButtonItem { @@ -98,13 +100,13 @@ class ShareViewController: SLComposeServiceViewController { account!.createFeed(url: url!.absoluteString, name: feedName, container: container) { result in - self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil) - switch result { - case .success(let feed): - break + case .success: + self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil) case .failure(let error): - print(error.localizedDescription) + self.presentError(error) { + self.extensionContext!.cancelRequest(withError: error) + } } } diff --git a/submodules/RSCore b/submodules/RSCore index 7af10d021..d640a2310 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 7af10d021f35df5596fa898ba55f5173fcb0e26b +Subproject commit d640a2310b96a0a3d4d34c49c08c7bce195d0762