1 files changed, 32 insertions, 4 deletions
diff --git a/iosApp/iosApp/Session/RootViewModel.swift b/iosApp/iosApp/Session/RootViewModel.swift
index ec103ba..16f21f3 100644
--- a/iosApp/iosApp/Session/RootViewModel.swift
+++ b/iosApp/iosApp/Session/RootViewModel.swift
@@ -20,14 +20,42 @@ import shared
 
 @MainActor
 class RootViewModel: ObservableObject {
+    @Inject private var networkController: NetworkController
     @Inject private var sessionController: SessionController
     
+    @Published var networkAvailable: Bool? = nil
     @Published var loginState: SessionController.LoginState = SessionController.LoginStateNothing()
+    @Published var showLoadingView: Bool = false
+    
+    var hasSession: Bool{
+        get { return sessionController.hasSession }
+    }
     
     init() {
-        let collector = Collector<SessionController.LoginState?>(callback: setLoginState)
-        sessionController.loginStateFlow.collect(collector: collector) { _ in }
-        restoreSession()
+        let networkCollector = Collector<Bool?>(callback: setNetworkState)
+        networkController.networkAvailable.collect(collector: networkCollector) { _ in }
+        let sessionCollector = Collector<SessionController.LoginState?>(callback: setLoginState)
+        sessionController.loginStateFlow.collect(collector: sessionCollector) { _ in }
+    }
+    
+    func setNetworkState(state: Bool?) {
+        print("Network state is: \(state?.description ?? "")")
+        Task { @MainActor in
+            self.networkAvailable = state
+            
+            // Wait for internet to restore session
+            if (state == true && sessionController.hasSession) {
+                showLoadingView = false
+                restoreSession()
+                return
+            }
+            
+            if (state == nil) {
+                showLoadingView = true
+            } else {
+                showLoadingView = hasSession
+            }
+        }
     }
     
     func setLoginState(state: SessionController.LoginState?) {
@@ -38,7 +66,7 @@ class RootViewModel: ObservableObject {
     }
     
     func restoreSession() {
-        sessionController.restoreSession()
+        sessionController.getSession()
     }
     
     private func getFcmToken() -> String? {