From 601e12fa29486058dd81c08cee549e5e4514a550 Mon Sep 17 00:00:00 2001
From: Yi Wang <yiw@uber.com>
Date: Tue, 5 Dec 2017 10:58:45 -0800
Subject: [PATCH] Fix tutorials view-less RIB inheritance

View-less RIBs should not inherit from `ViewableRouter`. It'll cause false positive leak detection.
---
 .../TicTacToe/LoggedIn/LoggedInInteractor.swift             | 1 -
 .../TicTacToe/LoggedIn/LoggedInRouter.swift                 | 6 ++++--
 .../tutorial3/TicTacToe/LoggedIn/LoggedInInteractor.swift   | 1 -
 .../tutorial3/TicTacToe/LoggedIn/LoggedInRouter.swift       | 6 ++++--
 .../TicTacToe/LoggedIn/LoggedInInteractor.swift             | 1 -
 .../TicTacToe/LoggedIn/LoggedInRouter.swift                 | 6 ++++--
 .../tutorial4/TicTacToe/LoggedIn/LoggedInInteractor.swift   | 1 -
 .../tutorial4/TicTacToe/LoggedIn/LoggedInRouter.swift       | 6 ++++--
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift b/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
index 35ea1722..268b31f1 100644
--- a/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
+++ b/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
@@ -35,7 +35,6 @@ protocol LoggedInListener: class {
 final class LoggedInInteractor: Interactor, LoggedInInteractable {
 
     weak var router: LoggedInRouting?
-
     weak var listener: LoggedInListener?
 
     // TODO: Add additional dependencies to constructor. Do not perform any logic
diff --git a/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInRouter.swift b/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
index bad7a3e4..1c1f3aa3 100644
--- a/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
+++ b/ios/tutorials/tutorial3-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
@@ -26,15 +26,16 @@ protocol LoggedInViewControllable: ViewControllable {
     func dismiss(viewController: ViewControllable)
 }
 
-final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
+final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
 
     init(interactor: LoggedInInteractable,
          viewController: LoggedInViewControllable,
          offGameBuilder: OffGameBuildable,
          ticTacToeBuilder: TicTacToeBuildable) {
+        self.viewController = viewController
         self.offGameBuilder = offGameBuilder
         self.ticTacToeBuilder = ticTacToeBuilder
-        super.init(interactor: interactor, viewController: viewController)
+        super.init(interactor: interactor)
         interactor.router = self
     }
 
@@ -67,6 +68,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
 
     // MARK: - Private
 
+    private let viewController: LoggedInViewControllable
     private let offGameBuilder: OffGameBuildable
     private let ticTacToeBuilder: TicTacToeBuildable
 
diff --git a/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInInteractor.swift b/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInInteractor.swift
index ca361ec4..675d9c99 100644
--- a/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInInteractor.swift
+++ b/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInInteractor.swift
@@ -35,7 +35,6 @@ protocol LoggedInListener: class {
 final class LoggedInInteractor: Interactor, LoggedInInteractable {
 
     weak var router: LoggedInRouting?
-
     weak var listener: LoggedInListener?
 
     // TODO: Add additional dependencies to constructor. Do not perform any logic
diff --git a/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInRouter.swift b/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInRouter.swift
index bad7a3e4..1c1f3aa3 100644
--- a/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInRouter.swift
+++ b/ios/tutorials/tutorial3/TicTacToe/LoggedIn/LoggedInRouter.swift
@@ -26,15 +26,16 @@ protocol LoggedInViewControllable: ViewControllable {
     func dismiss(viewController: ViewControllable)
 }
 
-final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
+final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
 
     init(interactor: LoggedInInteractable,
          viewController: LoggedInViewControllable,
          offGameBuilder: OffGameBuildable,
          ticTacToeBuilder: TicTacToeBuildable) {
+        self.viewController = viewController
         self.offGameBuilder = offGameBuilder
         self.ticTacToeBuilder = ticTacToeBuilder
-        super.init(interactor: interactor, viewController: viewController)
+        super.init(interactor: interactor)
         interactor.router = self
     }
 
@@ -67,6 +68,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
 
     // MARK: - Private
 
+    private let viewController: LoggedInViewControllable
     private let offGameBuilder: OffGameBuildable
     private let ticTacToeBuilder: TicTacToeBuildable
 
diff --git a/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift b/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
index 8a71b5aa..8322b387 100644
--- a/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
+++ b/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInInteractor.swift
@@ -30,7 +30,6 @@ protocol LoggedInListener: class {
 final class LoggedInInteractor: Interactor, LoggedInInteractable, LoggedInActionableItem {
 
     weak var router: LoggedInRouting?
-
     weak var listener: LoggedInListener?
 
     // TODO: Add additional dependencies to constructor. Do not perform any logic
diff --git a/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInRouter.swift b/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
index c2af8098..9b4cec5b 100644
--- a/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
+++ b/ios/tutorials/tutorial4-completed/TicTacToe/LoggedIn/LoggedInRouter.swift
@@ -25,13 +25,14 @@ protocol LoggedInViewControllable: ViewControllable {
     func replaceModal(viewController: ViewControllable?)
 }
 
-final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
+final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
 
     init(interactor: LoggedInInteractable,
          viewController: LoggedInViewControllable,
          offGameBuilder: OffGameBuildable) {
+        self.viewController = viewController
         self.offGameBuilder = offGameBuilder
-        super.init(interactor: interactor, viewController: viewController)
+        super.init(interactor: interactor)
         interactor.router = self
     }
 
@@ -59,6 +60,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
 
     // MARK: - Private
 
+    private let viewController: LoggedInViewControllable
     private let offGameBuilder: OffGameBuildable
 
     private var currentChild: ViewableRouting?
diff --git a/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInInteractor.swift b/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInInteractor.swift
index 7b1cfa0f..a2e4ff30 100644
--- a/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInInteractor.swift
+++ b/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInInteractor.swift
@@ -30,7 +30,6 @@ protocol LoggedInListener: class {
 final class LoggedInInteractor: Interactor, LoggedInInteractable {
 
     weak var router: LoggedInRouting?
-
     weak var listener: LoggedInListener?
 
     // TODO: Add additional dependencies to constructor. Do not perform any logic
diff --git a/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInRouter.swift b/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInRouter.swift
index c2af8098..9b4cec5b 100644
--- a/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInRouter.swift
+++ b/ios/tutorials/tutorial4/TicTacToe/LoggedIn/LoggedInRouter.swift
@@ -25,13 +25,14 @@ protocol LoggedInViewControllable: ViewControllable {
     func replaceModal(viewController: ViewControllable?)
 }
 
-final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
+final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
 
     init(interactor: LoggedInInteractable,
          viewController: LoggedInViewControllable,
          offGameBuilder: OffGameBuildable) {
+        self.viewController = viewController
         self.offGameBuilder = offGameBuilder
-        super.init(interactor: interactor, viewController: viewController)
+        super.init(interactor: interactor)
         interactor.router = self
     }
 
@@ -59,6 +60,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
 
     // MARK: - Private
 
+    private let viewController: LoggedInViewControllable
     private let offGameBuilder: OffGameBuildable
 
     private var currentChild: ViewableRouting?