make it so the loadProjects call is made on the ui thread to avoid is…

…sues with re-assigning the layout manager, also added some null safety for fun (#2087)
kickstarter · Aug 1, 2024 · 2d6291c · 2d6291c
1 parent 3e12d8d
commit 2d6291c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/activities/ProfileActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/ProfileActivity.kt
@@ -111,7 +111,9 @@ class ProfileActivity : ComponentActivity() {
         this.viewModel.outputs.projectList()
             .compose(observeForUIV2())
             .subscribe {
-                this.loadProjects(it)
+                runOnUiThread {
+                    this.loadProjects(it)
+                }
             }
             .addToDisposable(disposables)
 

diff --git a/app/src/main/java/com/kickstarter/viewmodels/ProfileViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/ProfileViewModel.kt
@@ -10,6 +10,7 @@ import com.kickstarter.libs.utils.EventContextValues
 import com.kickstarter.libs.utils.NumberUtils
 import com.kickstarter.libs.utils.extensions.addToDisposable
 import com.kickstarter.libs.utils.extensions.isNonZero
+import com.kickstarter.libs.utils.extensions.isNotNull
 import com.kickstarter.libs.utils.extensions.isZero
 import com.kickstarter.models.Project
 import com.kickstarter.services.DiscoveryParams
@@ -136,7 +137,8 @@ interface ProfileViewModel {
                 .build()
 
             paginator.isFetching
-                .subscribe(this.isFetchingProjects)
+                .subscribe { this.isFetchingProjects.onNext(it) }
+                .addToDisposable(disposables)
 
             val loggedInUser = this.currentUser.loggedInUser()
 
@@ -166,7 +168,7 @@ interface ProfileViewModel {
             ) { a, b -> Pair.create(a, b) }
                 .map { p -> p.first || p.second }
 
-            this.projectList = paginator.paginatedData()
+            this.projectList = paginator.paginatedData().filter { it.isNotNull() }
             this.resumeDiscoveryActivity = this.exploreProjectsButtonClicked
 
             this.startMessageThreadsActivity = this.messagesButtonClicked