Compare commits

...

2 Commits

Author SHA1 Message Date
Shadowfacts a8a8ea10a1 Fix redirects not being handled
Closes #1
2020-12-20 22:57:29 -05:00
Shadowfacts d2f3ddf864 Fix reload not working 2020-12-20 22:27:59 -05:00
4 changed files with 23 additions and 11 deletions

View File

@ -68,7 +68,7 @@ public class NavigationManager: NSObject, ObservableObject {
@objc public func reload() { @objc public func reload() {
let url = currentURL let url = currentURL
currentURL = url currentURL = url
// todo: send navigation op navigationOperation.send(.reload)
} }
@objc public func goBack() { @objc public func goBack() {
@ -105,6 +105,6 @@ public class NavigationManager: NSObject, ObservableObject {
public extension NavigationManager { public extension NavigationManager {
enum Operation { enum Operation {
case go, forward(count: Int), backward(count: Int) case go, reload, forward(count: Int), backward(count: Int)
} }
} }

View File

@ -134,6 +134,10 @@ class BrowserNavigationController: UIViewController {
backBrowserVCs.append(currentBrowserVC) backBrowserVCs.append(currentBrowserVC)
newVC = BrowserWebViewController(navigator: navigator, url: navigator.currentURL) newVC = BrowserWebViewController(navigator: navigator, url: navigator.currentURL)
case .reload:
currentBrowserVC.reload()
return
case let .backward(count: count): case let .backward(count: count):
var removed = backBrowserVCs.suffix(count) var removed = backBrowserVCs.suffix(count)
backBrowserVCs.removeLast(count) backBrowserVCs.removeLast(count)

View File

@ -129,6 +129,11 @@ class BrowserWebViewController: UIViewController {
loadDocument() loadDocument()
} }
func reload() {
loaded = false
loadDocument()
}
private func loadDocument() { private func loadDocument() {
guard !loaded else { return } guard !loaded else { return }
@ -149,10 +154,11 @@ class BrowserWebViewController: UIViewController {
} }
case let .success(response): case let .success(response):
if response.status.isRedirect { if response.status.isRedirect {
DispatchQueue.main.async {
print("Trying to redirect to: '\(response.meta)'")
if let redirect = URL(string: response.meta) { if let redirect = URL(string: response.meta) {
self.navigator.changeURL(redirect) self.navigator.changeURL(redirect)
} else { } else {
DispatchQueue.main.async {
self.showError(message: "Invalid redirect URL: '\(response.meta)'") self.showError(message: "Invalid redirect URL: '\(response.meta)'")
} }
} }

View File

@ -88,12 +88,14 @@ class GeminiProtocol: NWProtocolFramerImplementation {
let header = GeminiResponseHeader(status: statusCode, meta: meta) let header = GeminiResponseHeader(status: statusCode, meta: meta)
let message = NWProtocolFramer.Message(geminiResponseHeader: header) let message = NWProtocolFramer.Message(geminiResponseHeader: header)
while true { // What does the return value of deliverInputNoCopy mean, you ask? Why, I have no idea
if !framer.deliverInputNoCopy(length: .max, message: message, isComplete: true) { // It always returns true for a length of zero, so following the sample code and looping
// infinitely until it returns false causes an infinite loop.
// Additionally, calling deliverInput with an empty Data() causes an error inside Network.framework.
// So, we just ignore the result since it doesn't seem to cause any problems ¯\_()_/¯
_ = framer.deliverInputNoCopy(length: statusCode.isSuccess ? .max : 0, message: message, isComplete: true)
return 0 return 0
} }
}
}
func handleOutput(framer: NWProtocolFramer.Instance, message: NWProtocolFramer.Message, messageLength: Int, isComplete: Bool) { func handleOutput(framer: NWProtocolFramer.Instance, message: NWProtocolFramer.Message, messageLength: Int, isComplete: Bool) {
guard let request = message.geminiRequest else { fatalError("GeminiProtocol can't send message that doesn't have an associated GeminiRequest") } guard let request = message.geminiRequest else { fatalError("GeminiProtocol can't send message that doesn't have an associated GeminiRequest") }