Resolve implicitly_unwrapped_optional violations in SampleBrowser

mozilla-mobile · Jan 22, 2025 · cdbff29 · cdbff29
1 parent 6ecd083
commit cdbff29
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/SampleBrowser/SampleBrowser/Engine/EngineProvider.swift b/SampleBrowser/SampleBrowser/Engine/EngineProvider.swift
@@ -7,15 +7,15 @@ import WebEngine
 
 struct EngineProvider {
     // We only have one session in the SampleBrowser
-    private(set) var session: EngineSession?
+    private(set) var session: EngineSession
     let view: EngineView
 
-    init(engine: Engine = WKEngine.factory(),
-         sessionDependencies: EngineSessionDependencies? = nil) {
+    init?(engine: Engine = WKEngine.factory(),
+          sessionDependencies: EngineSessionDependencies? = nil) {
         do {
             session = try engine.createSession(dependencies: sessionDependencies)
         } catch {
-            session = nil
+            return nil
         }
 
         view = engine.createView()

diff --git a/SampleBrowser/SampleBrowser/SceneDelegate.swift b/SampleBrowser/SampleBrowser/SceneDelegate.swift
@@ -8,15 +8,15 @@ import WebEngine
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
-    var engineProvider: EngineProvider = {
+    var engineProvider: EngineProvider? = {
         let dependencies = EngineSessionDependencies(telemetryProxy: TelemetryHandler())
         return EngineProvider(sessionDependencies: dependencies)
     }()
 
     func scene(_ scene: UIScene,
                willConnectTo session: UISceneSession,
                options connectionOptions: UIScene.ConnectionOptions) {
-        guard let windowScene = (scene as? UIWindowScene) else { return }
+        guard let windowScene = (scene as? UIWindowScene), let engineProvider else { return }
         let windowUUID = UUID()
         let baseViewController = RootViewController(engineProvider: engineProvider, windowUUID: windowUUID)
         window = UIWindow(windowScene: windowScene)

diff --git a/SampleBrowser/SampleBrowser/UI/Browser/BrowserViewController.swift b/SampleBrowser/SampleBrowser/UI/Browser/BrowserViewController.swift
@@ -21,7 +21,7 @@ class BrowserViewController: UIViewController,
                              FindInPageHelperDelegate {
     weak var navigationDelegate: NavigationDelegate?
     private lazy var progressView: UIProgressView = .build { _ in }
-    private var engineSession: EngineSession!
+    private var engineSession: EngineSession
     private var engineView: EngineView
     private let urlFormatter: URLFormatter
 
@@ -203,7 +203,7 @@ class BrowserViewController: UIViewController,
         guard let url = linkURL else { return nil }
 
         let previewProvider: UIContextMenuContentPreviewProvider = {
-            let previewEngineProvider = EngineProvider()
+            guard let previewEngineProvider = EngineProvider() else { return nil }
             let previewVC = BrowserViewController(engineProvider: previewEngineProvider)
             previewVC.engineSession.load(url: url.absoluteString)
             return previewVC

diff --git a/SampleBrowser/SampleBrowser/UI/Suggestion/SuggestionViewController.swift b/SampleBrowser/SampleBrowser/UI/Suggestion/SuggestionViewController.swift
@@ -10,7 +10,7 @@ protocol SuggestionViewControllerDelegate: AnyObject {
 
 class SuggestionViewController: UIViewController, UITableViewDelegate {
     private var tableView: UITableView
-    private var dataSource: SuggestionDataSource!
+    private var dataSource: SuggestionDataSource?
     private weak var delegate: SuggestionViewControllerDelegate?
 
     private var gradientLayer: CAGradientLayer?
@@ -87,14 +87,14 @@ class SuggestionViewController: UIViewController, UITableViewDelegate {
 
     func updateUI(for suggestions: [String]) {
         tableView.isHidden = suggestions.isEmpty
-        dataSource.suggestions = suggestions
+        dataSource?.suggestions = suggestions
         tableView.reloadData()
     }
 
     // MARK: - UITableViewDelegate
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let term = dataSource.suggestions[indexPath.row]
+        guard let term = dataSource?.suggestions[indexPath.row] else { return }
         delegate?.tapOnSuggestion(term: term)
     }
 }