Merge pull request #4603 from vector-im/feature/aris/remove_not_neede…

…d_job_cancel_4602 There is no need to call job.cancel() when we are using viewModelScope()
element-hq · Dec 1, 2021 · fa256cc · fa256cc
2 parents f800696 + 578a012
commit fa256cc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/changelog.d/4602.misc b/changelog.d/4602.misc
@@ -0,0 +1 @@
+There is no need to call job.cancel() when we are using viewModelScope()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -141,9 +141,4 @@ class SearchViewModel @AssistedInject constructor(
             )
         }
     }
-
-    override fun onCleared() {
-        currentTask?.cancel()
-        super.onCleared()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -231,9 +231,4 @@ class RoomDirectoryViewModel @AssistedInject constructor(
             }
         }
     }
-
-    override fun onCleared() {
-        currentJob?.cancel()
-        super.onCleared()
-    }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		There is no need to call job.cancel() when we are using viewModelScope()