Fix critical bug where the SSH channel got revoked after locking the …

…screen.

Add temporary shortcut for removing favorites.

AquaDoor/DoorTask.swift

@@ -17,6 +17,9 @@ class DoorTask {
 	private var start: (() -> Void)?
 	private var completion: ((Result) -> Void)?
 
+	private var tryingAgain = false
+	private var lastCommand: String!
+
 	private var delegate: LeaveDoorOpenDelegate?
 
 	public init(delegate: LeaveDoorOpenDelegate?) {
@@ -39,15 +42,26 @@ class DoorTask {
 
 	private func sendCommand(_ command: String) {
 		start?()
+		start = nil
+		lastCommand = command
 
 		SSHCommander.prepare(success: { instance in
 			instance.execute(command: command, completion: self.parseOutput)
-		}) { error in self.completion?(.error(error)) }
+		}, failure: { error in
+			self.completion?(.error(error)) }, force: tryingAgain)
 	}
 
 	private func parseOutput(_ output: String?) {
 		guard let output = output else {
-			completion?(.error(.executionFailed))
+			if tryingAgain {
+				tryingAgain = false
+				completion?(.error(.executionFailed))
+				return
+			}
+
+			tryingAgain = true
+			sendCommand(lastCommand)
+
 			return
 		}
 

AquaDoor/EmptyFavoritesViewController.swift

@@ -20,18 +20,21 @@ class EmptyFavoritesViewController: UIViewController {
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
+		// TODO: Consider using a gif. [Gifu](https://github.com/kaishin/Gifu)
 		player = AVPlayer(url: Bundle.main.url(forResource: "fish_and_doors_anim",
 		                                       withExtension: "mov")!)
 		(playerView.layer as! AVPlayerLayer).player = player
 		player.volume = 0
 		player.actionAtItemEnd = .none
+		try? AVAudioSession.sharedInstance().setCategory(AVAudioSessionCategoryPlayback, with: .mixWithOthers)
 
 		instructionLabel.isUserInteractionEnabled = true
 		instructionLabel.addGestureRecognizer(UITapGestureRecognizer(
 			target: self, action: #selector(didTapInstructionLabel)))
 	}
 
 	override func viewDidDisappear(_ animated: Bool) {
+
 		super.viewDidDisappear(animated)
 
 		NotificationCenter.default.removeObserver(self)

AquaDoor/Extensions.swift

@@ -39,6 +39,11 @@ public extension ImplicitlyUnwrappedOptional where Wrapped == Int {
 		defer { x = x + 1 }
 		return x
 	}
+
+	static prefix func --(x: inout Int!) -> Int! {
+		x = x - 1
+		return x
+	}
 }
 
 public extension UIImage {

AquaDoor/FavoriteCollectionViewCell.swift

@@ -59,4 +59,21 @@ class FavoriteCollectionViewCell: UICollectionViewCell {
 	}
 
 	var titleText: String { get { return title.text! }}
+
+	var delegate: FavoriteCollectionViewCellDelegate?
+
+	override func layoutSubviews() {
+		super.layoutSubviews()
+		addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(didLongPress)))
+	}
+
+	@objc private func didLongPress(_ recognizer: UILongPressGestureRecognizer) {
+		if recognizer.state == .began {
+			delegate?.didLongPress(cell: self)
+		}
+	}
+}
+
+protocol FavoriteCollectionViewCellDelegate {
+	func didLongPress(cell: FavoriteCollectionViewCell)
 }

AquaDoor/FavoritesViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 class FavoritesViewController: UICollectionViewController, UICollectionViewDelegateFlowLayout,
-CredentialAlertDelegate, DoorActionDelegate, EmptyStateDelegate {
+CredentialAlertDelegate, DoorActionDelegate, EmptyStateDelegate, FavoriteCollectionViewCellDelegate {
 	private let sectionCount = 1
 	private let itemsPerRow: CGFloat = 2
 	private let cellInsets = UIEdgeInsets(top: 15, left: 15, bottom: 15, right: 15)
@@ -65,6 +65,8 @@ CredentialAlertDelegate, DoorActionDelegate, EmptyStateDelegate {
 			cell.gradient = .get(byId: door.colorId)
 		}
 
+		if cell.delegate == nil { cell.delegate = self }
+
 		return cell
 	}
 
@@ -84,10 +86,21 @@ CredentialAlertDelegate, DoorActionDelegate, EmptyStateDelegate {
 		return cellInsets.left
 	}
 
+	internal func didLongPress(cell: FavoriteCollectionViewCell) {
+		do { try database.delete(doorWithId: cell.doorId) }
+		catch { return }
+
+		if --doorCount == 0 { presentChildViewController(withIdentifier: "EmptyFavorites") }
+
+		if let indexPath = collectionView?.indexPath(for: cell) {
+			collectionView!.deleteItems(at: [indexPath])
+		}
+	}
+
 	/// Makes sure that an SSH session is created (if possible) before actual usage
 	/// and does not care if the error is not related to credentials.
 	private func prepareSSHCommander() {
-		SSHCommander.prepare(success: nil, failure: credentialErrorDidOccur)
+		SSHCommander.prepare(success: nil, failure: credentialErrorDidOccur, force: false)
 	}
 
 	private func presentCredentialsAlertController(withTitle title: String) {

AquaDoor/SSHCommander.swift

@@ -22,14 +22,14 @@ class SSHCommander {
 
 	private init() {}
 
-	public static func prepare(success: ((SSHCommander) -> Void)?, failure: @escaping (SSHError) -> Void) {
+	public static func prepare(success: ((SSHCommander) -> Void)?, failure: @escaping (SSHError) -> Void, force: Bool) {
 		guard credentials != nil else {
 			failure(.credentialsNotFound)
 			return
 		}
 
 		shared.sshQueue.async {
-			if let session = shared.session, session.isConnected && session.isAuthorized {
+			if !force, let session = shared.session, session.isConnected && session.isAuthorized {
 				shared.mainQueue.async { success?(shared) }
 				return
 			}
@@ -41,7 +41,7 @@ class SSHCommander {
 	private func connect(_ success: ((SSHCommander) -> Void)?, _ failure: @escaping (SSHError) -> Void) {
 		let (username, password) = SSHCommander.credentials!
 
-		if let oldSession = self.session { if oldSession.isConnected { oldSession.disconnect() }}
+		if let oldSession = session { if oldSession.isConnected { oldSession.disconnect(); session = nil }}
 		let newSession = NMSSHSession(host: host, andUsername: username)!
 
 		do {
@@ -62,7 +62,7 @@ class SSHCommander {
 			return
 		}
 
-		self.session = newSession
+		session = newSession
 		mainQueue.async { success?(.shared) }
 	}
 

Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - KeychainSwift (9.0.2)
-  - MarqueeLabel/Swift (3.1.3)
+  - KeychainSwift (10.0.0)
+  - MarqueeLabel/Swift (3.1.4)
   - NMSSH (2.2.8)
   - SQLite.swift (0.11.4):
     - SQLite.swift/standard (= 0.11.4)
@@ -15,8 +15,8 @@ DEPENDENCIES:
   - UITextField+Shake
 
 SPEC CHECKSUMS:
-  KeychainSwift: 3ab1d428d0dbff59cd056f1d0bfc640b36c2b081
-  MarqueeLabel: baa5753dcbd36dca080e1f5c589a665aa5c906f1
+  KeychainSwift: f9f7910449a0c0fd2cabc889121530dd2c477c33
+  MarqueeLabel: bf768455fe88d427f71476ebb23f9092b660f40b
   NMSSH: b722885a07485a2c03ffa3ea56a7b0308dbdc37c
   SQLite.swift: 3e3bee21da701b5b9f87c4a672cb54f233505692
   UITextField+Shake: 3e86d67700b9db1915df965e677cec8b8cfda225