Skip to content

Allow clients to explicitly dismiss kill switch via Bellerophon manager #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dominicancrum wants to merge 1 commit into
base: release/1.0.2
Choose a base branch
from
Open

Allow clients to explicitly dismiss kill switch via Bellerophon manager #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions Bellerophon/Bellerophon/Sources/BPManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ public class BellerophonManager: NSObject {
}
}
}

public func dismissKillSwitchIfNeeded() {
Copy link
Contributor

@ThibaultKlein ThibaultKlein Sep 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name isn't very explicit, maybe keep this function internal, and create a new public function with a more descriptive name that calls this one?

Copy link
Contributor

@ThibaultKlein ThibaultKlein Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dominicancrum any updates on this PR?

Copy link
Author

@dominicancrum dominicancrum Sep 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the recent changes to the kill switch I think this can actually be closed @ThibaultKlein

guard killSwitchWindow.isKeyWindow else {
return
}

delegate?.bellerophonWillDisengage?(self)
mainWindow?.makeKeyAndVisible()
killSwitchWindow.isHidden = true
}

// MARK: internal Methods

Expand Down Expand Up @@ -142,15 +152,6 @@ public class BellerophonManager: NSObject {
killSwitchWindow.makeKeyAndVisible()
}

internal func dismissKillSwitchIfNeeded() {
guard killSwitchWindow.isKeyWindow else {
return
}

delegate?.bellerophonWillDisengage?(self)
mainWindow?.makeKeyAndVisible()
killSwitchWindow.isHidden = true
}

internal func startAutoChecking(_ status: BellerophonObservable) {
if retryTimer == nil {
Expand Down