Fix some issues with the unread counts not being accurate right after…

… login, and not updating after logging out. (#537)
LemmyNet · Jun 12, 2023 · 1bcea4f · 1bcea4f
1 parent cc75c10
commit 1bcea4f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt
@@ -699,6 +699,7 @@ fun fetchInitialData(
             changeListingType = ListingType.Local,
             changeSortType = SortType.Active,
         )
+        homeViewModel.fetchUnreadCounts()
     }
 
     siteViewModel.fetchSite(

diff --git a/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt b/app/src/main/java/com/jerboa/ui/components/home/HomeViewModel.kt
@@ -83,28 +83,32 @@ class HomeViewModel : ViewModel() {
     }
 
     fun fetchUnreadCounts(
-        account: Account,
+        account: Account? = null,
         ctx: Context? = null,
     ) {
-        viewModelScope.launch {
-            try {
-                val api = API.getInstance()
-                val form = GetUnreadCount(
-                    auth = account.jwt,
-                )
-                Log.d(
-                    "jerboa",
-                    "Fetching unread counts: $form",
-                )
-                unreadCountResponse = retrofitErrorHandler(
-                    api.getUnreadCount(
-                        form = form
-                            .serializeToMap(),
-                    ),
-                )
-            } catch (e: Exception) {
-                toastException(ctx = ctx, error = e)
+        account?.let {
+            viewModelScope.launch {
+                try {
+                    val api = API.getInstance()
+                    val form = GetUnreadCount(
+                        auth = account.jwt,
+                    )
+                    Log.d(
+                        "jerboa",
+                        "Fetching unread counts: $form",
+                    )
+                    unreadCountResponse = retrofitErrorHandler(
+                        api.getUnreadCount(
+                            form = form
+                                .serializeToMap(),
+                        ),
+                    )
+                } catch (e: Exception) {
+                    toastException(ctx = ctx, error = e)
+                }
             }
+        } ?: run {
+            unreadCountResponse = GetUnreadCountResponse(0, 0, 0)
         }
     }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/login/LoginViewModel.kt b/app/src/main/java/com/jerboa/ui/components/login/LoginViewModel.kt
@@ -19,6 +19,7 @@ import com.jerboa.datatypes.SortType
 import com.jerboa.datatypes.api.Login
 import com.jerboa.db.Account
 import com.jerboa.db.AccountViewModel
+import com.jerboa.fetchInitialData
 import com.jerboa.ui.components.home.HomeViewModel
 import com.jerboa.ui.components.home.SiteViewModel
 import kotlinx.coroutines.cancel
@@ -117,6 +118,12 @@ class LoginViewModel : ViewModel() {
             // Save that info in the DB
             accountViewModel.insert(account)
 
+            fetchInitialData(
+                account = account,
+                siteViewModel = siteViewModel,
+                homeViewModel = homeViewModel,
+            )
+
             loading = false
 
             navController.navigate(route = "home")