Skip to content

Merge onCleared into onStop #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 1 commit into from
May 12, 2026
Merged

Merge onCleared into onStop #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ui/home/src/main/kotlin/com/github/kr328/clash/home/vm/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ internal class HomeViewModel(app: Application) : AndroidViewModel(app), DefaultL
trafficPollingJob = null
}

override fun onCleared() {
broadcastEventsJob?.cancel()
trafficPollingJob?.cancel()
}

fun toggleStatus() {
if (clashRunning.value) {
application.stopClashService()
Expand Down
6 changes: 0 additions & 6 deletions ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/ProfilesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ internal class ProfilesViewModel(app: Application) :
elapsedJob = null
}

override fun onCleared() {
broadcastEventsJob?.cancel()
elapsedJob?.cancel()
fetchJob?.cancel()
}

fun consumeEvent() {
eventState.value = EventState.Idle
}
Expand Down
6 changes: 0 additions & 6 deletions ui/profile/src/main/kotlin/com/github/kr328/clash/profile/vm/ProvidersViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ internal class ProvidersViewModel(app: Application) :
elapsedJob = null
}

override fun onCleared() {
broadcastEventsJob?.cancel()
elapsedJob?.cancel()
fetchJob?.cancel()
}

fun consumeEvent() {
eventState.value = EventState.Idle
}
Expand Down
7 changes: 0 additions & 7 deletions ui/proxy/src/main/kotlin/com/github/kr328/clash/proxy/vm/ProxyViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ internal class ProxyViewModel(app: Application) : AndroidViewModel(app), Default
fetchInitialStateJob = null
}

override fun onCleared() {
broadcastEventsJob?.cancel()
broadcastEventsJob = null
fetchInitialStateJob?.cancel()
fetchInitialStateJob = null
}

fun consumeEvent() {
eventState.value = EventState.Idle
}
Expand Down