kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2614 from gouri-panda/bug/gouri-panda/#2608_Fixed_Zim_Manage_View_Model_leaking

Browse Source 
Fixed ZimManageViewModel Leaking
This commit is contained in:
Kelson 2021-04-05 17:14:00 +02:00 committed by GitHub
commit 47e7315b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ConnectivityBroadcastReceiver.kt
View File

@ -43,4 +43,8 @@ class ConnectivityBroadcastReceiver @Inject constructor(
) { ) {
_networkStates.onNext(connectivityManager.networkState) _networkStates.onNext(connectivityManager.networkState)
} }
fun stopNetworkState() {
_networkStates.onComplete()
}
} }

11
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
View File

@ -116,10 +116,10 @@ class ZimManageViewModel @Inject constructor(
val requestDownloadLibrary = BehaviorProcessor.createDefault(Unit) val requestDownloadLibrary = BehaviorProcessor.createDefault(Unit)
val requestFiltering = BehaviorProcessor.createDefault("") val requestFiltering = BehaviorProcessor.createDefault("")
private val compositeDisposable = CompositeDisposable() private var compositeDisposable: CompositeDisposable? = CompositeDisposable()
init { init {
compositeDisposable.addAll(*disposables()) compositeDisposable?.addAll(*disposables())
context.registerReceiver(connectivityBroadcastReceiver) context.registerReceiver(connectivityBroadcastReceiver)
} }
@ -129,8 +129,13 @@ class ZimManageViewModel @Inject constructor(
} }
override fun onCleared() { override fun onCleared() {
compositeDisposable.clear() compositeDisposable?.clear()
context.unregisterReceiver(connectivityBroadcastReceiver) context.unregisterReceiver(connectivityBroadcastReceiver)
connectivityBroadcastReceiver.stopNetworkState()
requestFileSystemCheck.onComplete()
fileSelectActions.onComplete()
requestDownloadLibrary.onComplete()
compositeDisposable = null
super.onCleared() super.onCleared()
} }