Do not use execute{ }

vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt

@@ -18,21 +18,22 @@ package im.vector.riotredesign.features.home
 
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.rx.rx
 import im.vector.riotredesign.core.platform.VectorViewModel
 import org.koin.android.ext.android.get
 
+/**
+ * View model used to update the home bottom bar notification counts
+ */
 class HomeDetailViewModel(initialState: HomeDetailViewState,
-                          private val session: Session)
+                          private val homeRoomListStore: HomeRoomListObservableStore)
     : VectorViewModel<HomeDetailViewState>(initialState) {
 
     companion object : MvRxViewModelFactory<HomeDetailViewModel, HomeDetailViewState> {
 
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: HomeDetailViewState): HomeDetailViewModel? {
-            val currentSession = viewModelContext.activity.get<Session>()
+            val homeRoomListStore = viewModelContext.activity.get<HomeRoomListObservableStore>()
-            return HomeDetailViewModel(state, currentSession)
+            return HomeDetailViewModel(state, homeRoomListStore)
         }
     }
 
@@ -42,13 +43,11 @@ class HomeDetailViewModel(initialState: HomeDetailViewState,
 
     // PRIVATE METHODS *****************************************************************************
 
-    // TODO Filter with selected group
     private fun observeRoomSummaries() {
-        session
+        homeRoomListStore
-                .rx()
+                .observe()
-                .liveRoomSummaries()
+                .subscribe { list ->
-                .execute { state ->
+                    list.let { summaries ->
-                    state.invoke()?.let { summaries ->
                         val peopleNotifications = summaries
                                 .filter { it.isDirect }
                                 .map { it.notificationCount }
@@ -65,6 +64,7 @@ class HomeDetailViewModel(initialState: HomeDetailViewState,
                                 .filter { !it.isDirect }
                                 .any { it.highlightCount > 0 }
 
+                        setState {
                             copy(
                                     notificationCountCatchup = peopleNotifications + roomsNotifications,
                                     notificationHighlightCatchup = peopleHasHighlight || roomsHasHighlight,
@@ -73,11 +73,10 @@ class HomeDetailViewModel(initialState: HomeDetailViewState,
                                     notificationCountRooms = roomsNotifications,
                                     notificationHighlightRooms = roomsHasHighlight
                             )
-                    } ?: run {
-                        // No change
-                        copy()
                         }
                     }
                 }
+                .disposeOnClear()
+    }
 
 }

vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt

@@ -82,14 +82,15 @@ class RoomDirectoryViewModel(initialState: PublicRoomsViewState,
         session
                 .rx()
                 .liveRoomSummaries()
-                .execute { async ->
+                .subscribe { list ->
-                    val joinedRoomIds = async.invoke()
+                    val joinedRoomIds = list
                             // Keep only joined room
                             ?.filter { it.membership == Membership.JOIN }
                             ?.map { it.roomId }
                             ?.toList()
                             ?: emptyList()
 
+                    setState {
                         copy(
                                 joinedRoomsIds = joinedRoomIds,
                                 // Remove (newly) joined room id from the joining room list
@@ -99,6 +100,8 @@ class RoomDirectoryViewModel(initialState: PublicRoomsViewState,
                         )
                     }
                 }
+                .disposeOnClear()
+    }
 
     fun setRoomDirectoryData(roomDirectoryData: RoomDirectoryData) {
         if (this.roomDirectoryData == roomDirectoryData) {

vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt

@@ -49,24 +49,26 @@ class RoomPreviewViewModel(initialState: RoomPreviewViewState,
         session
                 .rx()
                 .liveRoomSummaries()
-                .execute { async ->
+                .subscribe { list ->
-                    val isRoomJoined = async.invoke()
+                    withState { state ->
+                        val isRoomJoined = list
                                 // Keep only joined room
                                 ?.filter { it.membership == Membership.JOIN }
                                 ?.map { it.roomId }
                                 ?.toList()
-                            ?.contains(roomId) == true
+                                ?.contains(state.roomId) == true
 
                         if (isRoomJoined) {
+                            setState {
                                 copy(
                                         roomJoinState = JoinState.JOINED
                                 )
-                    } else {
-                        // TODO No change...
-                        copy()
                             }
                         }
                     }
+                }
+                .disposeOnClear()
+    }
 
     // TODO I should not have to do that
     fun init(roomId: String) = withState {