Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile

2 files changed, 38 insertions, 5 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
index 6a30789..8879349 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
@@ -67,7 +67,6 @@ class LoginFragment : Fragment() {
                     getString(R.string.default_server_url)
                 ) ?: getString(R.string.default_server_url)
         )
-        loginViewModel.restoreSession()
     }
 
     override fun onStart() {
@@ -100,6 +99,26 @@ class LoginFragment : Fragment() {
     }
 
     private fun setupObservers() {
+        loginViewModel.networkAvailable.observe(viewLifecycleOwner) { available ->
+            Log.d("LoginFragment", "available = $available, session = ${loginViewModel.hasSession}")
+
+            binding.offlineBanner.root.visibility =
+                if (available == true) View.GONE else View.VISIBLE
+
+            binding.infoLoading.root.visibility = when (available) {
+                null -> View.VISIBLE
+                true -> if (loginViewModel.hasSession) {
+                    loginViewModel.restoreSession()
+                    View.VISIBLE
+                } else View.GONE
+                false -> if (loginViewModel.hasSession) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
+            }
+        }
+
         loginViewModel.loginState.observe(viewLifecycleOwner) { result ->
             Log.d("LoginFragment", result.toString())
             when (result) {
@@ -164,4 +183,4 @@ class LoginFragment : Fragment() {
         const val PREFERENCE_SERVER_URL = "server_url"
         const val PREFERENCE_TOKEN = "token"
     }
-}
\ No newline at end of file
+}
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
index bcee2ec..434ac44 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
@@ -17,32 +17,46 @@
  */
 package mx.trackermap.TrackerMap.android.session
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.zhuinden.eventemitter.EventEmitter
 import com.zhuinden.eventemitter.EventSource
 import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import mx.trackermap.TrackerMap.client.models.SessionBody
+import mx.trackermap.TrackerMap.controllers.NetworkController
 import mx.trackermap.TrackerMap.controllers.SessionController
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 @DelicateCoroutinesApi
 class LoginViewModel : ViewModel(), KoinComponent {
-
+    private val networkController: NetworkController by inject()
     private val sessionController: SessionController by inject()
 
+    private val _networkAvailable = MutableLiveData<Boolean?>(null)
+    val networkAvailable: LiveData<Boolean?> = _networkAvailable
     private val loginStateEmitter = EventEmitter<SessionController.LoginState>()
     val loginState: EventSource<SessionController.LoginState> = loginStateEmitter
+    val hasSession: Boolean get() = sessionController.hasSession
 
     init {
         viewModelScope.launch {
+            setupNetworkObserver()
+        }
+        viewModelScope.launch {
             setupLoginStateObserver()
         }
     }
 
+    private suspend fun setupNetworkObserver() {
+        networkController.networkAvailable.collect {
+            _networkAvailable.postValue(it)
+        }
+    }
+
     private suspend fun setupLoginStateObserver() {
         sessionController.loginStateFlow.collect {
             it?.let {
@@ -52,7 +66,7 @@ class LoginViewModel : ViewModel(), KoinComponent {
     }
 
     fun restoreSession() {
-        sessionController.restoreSession()
+        sessionController.getSession()
     }
 
     fun login(email: String, password: String, url: String, token: String?) {