-
Notifications
You must be signed in to change notification settings - Fork 131
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/app-provider' into milestone/12.0
- Loading branch information
Showing
13 changed files
with
659 additions
and
26 deletions.
There are no files selected for viewing
Submodule ios-sdk
updated
61 files
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
120 changes: 120 additions & 0 deletions
120
ownCloud/Client/Actions/Actions+Extensions/ClientWebAppViewController.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,120 @@ | ||
| // | ||
| // ClientWebAppViewController.swift | ||
| // ownCloud | ||
| // | ||
| // Created by Felix Schwarz on 19.09.22. | ||
| // Copyright © 2022 ownCloud GmbH. All rights reserved. | ||
| // | ||
|
|
||
| /* | ||
| * Copyright (C) 2022, ownCloud GmbH. | ||
| * | ||
| * This code is covered by the GNU Public License Version 3. | ||
| * | ||
| * For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/ | ||
| * You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>. | ||
| * | ||
| */ | ||
|
|
||
| import UIKit | ||
| import WebKit | ||
| import ownCloudAppShared | ||
|
|
||
| class ClientWebAppViewController: UIViewController, WKUIDelegate { | ||
| var urlRequest: URLRequest | ||
| var webView: WKWebView? | ||
|
|
||
| var shouldSendCloseEvent: Bool = true | ||
|
|
||
| init(with urlRequest: URLRequest) { | ||
| self.urlRequest = urlRequest | ||
|
|
||
| super.init(nibName: nil, bundle: nil) | ||
|
|
||
| self.isModalInPresentation = true | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| var webViewConfiguration: WKWebViewConfiguration { | ||
| let configuration = WKWebViewConfiguration() | ||
| let webSiteDataStore = WKWebsiteDataStore.nonPersistent() | ||
|
|
||
| configuration.websiteDataStore = webSiteDataStore | ||
| configuration.applicationNameForUserAgent = "MobileSafari" // Needed for some web apps that will present the desktop UI otherwise (f.ex. OnlyOffice as of 2022-09-19) | ||
|
|
||
| return configuration | ||
| } | ||
|
|
||
| override func loadView() { | ||
| let rootView = UIView() | ||
|
|
||
| webView = WKWebView(frame: .zero, configuration: webViewConfiguration) | ||
| webView?.translatesAutoresizingMaskIntoConstraints = false | ||
| webView?.uiDelegate = self | ||
|
|
||
| rootView.addSubview(webView!) | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| webView!.leadingAnchor.constraint(equalTo: rootView.safeAreaLayoutGuide.leadingAnchor), | ||
| webView!.trailingAnchor.constraint(equalTo: rootView.safeAreaLayoutGuide.trailingAnchor), | ||
| webView!.topAnchor.constraint(equalTo: rootView.safeAreaLayoutGuide.topAnchor), | ||
| webView!.bottomAnchor.constraint(equalTo: rootView.safeAreaLayoutGuide.bottomAnchor) | ||
| ]) | ||
|
|
||
| view = rootView | ||
| } | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .close, primaryAction: UIAction(handler: { [weak self] _ in | ||
| if self?.shouldSendCloseEvent == true { | ||
| // Close via window.close(), which is calling dismissSecurely() once done | ||
| self?.closeWebWindow() | ||
|
|
||
| // Call dismissOnce() after 10 seconds regardless | ||
| OnMainThread(after: 10) { | ||
| self?.dismissOnce() | ||
| } | ||
| } else { | ||
| // Close directly | ||
| self?.closeWebWindow() | ||
| } | ||
| })) | ||
| } | ||
|
|
||
| override func viewWillAppear(_ animated: Bool) { | ||
| super.viewWillAppear(animated) | ||
| webView?.load(urlRequest) | ||
| } | ||
|
|
||
| override func viewDidDisappear(_ animated: Bool) { | ||
| super.viewDidDisappear(animated) | ||
|
|
||
| // Drop web view | ||
| webView?.uiDelegate = nil | ||
| webView?.removeFromSuperview() | ||
| webView = nil | ||
| } | ||
|
|
||
| private var isDismissed = false | ||
| func dismissOnce() { | ||
| if !isDismissed { | ||
| isDismissed = true | ||
| self.dismiss(animated: true) | ||
| } | ||
| } | ||
|
|
||
| // window.close() handling | ||
| func closeWebWindow() { | ||
| webView?.evaluateJavaScript("window.close();") | ||
| } | ||
|
|
||
| // UI delegate | ||
| func webViewDidClose(_ webView: WKWebView) { | ||
| dismissOnce() | ||
| } | ||
| } |
Oops, something went wrong.