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

1 files changed, 21 insertions, 2 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
+}