Skip to content

Guard against NPE in SmbDeviceScannerObservable #4381

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
EmmanuelMess merged 1 commit into from
Apr 16, 2025
Merged

Guard against NPE in SmbDeviceScannerObservable #4381

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
8 changes: 6 additions & 2 deletions app/src/main/java/com/amaze/filemanager/utils/smb/SmbDeviceScannerObservable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.amaze.filemanager.utils.smb.SmbDeviceScannerObservable.DiscoverDevice
import io.reactivex.Observable
import io.reactivex.Observer
import io.reactivex.disposables.Disposable
import io.reactivex.disposables.Disposables
import io.reactivex.schedulers.Schedulers
import java.net.InetAddress

Expand All @@ -50,7 +51,7 @@ class SmbDeviceScannerObservable : Observable<ComputerParcelable>() {
fun onCancel()
}

var discoverDeviceStrategies: Array<DiscoverDeviceStrategy> =
private var discoverDeviceStrategies: Array<DiscoverDeviceStrategy> =
arrayOf(
WsddDiscoverDeviceStrategy(),
SameSubnetDiscoverDeviceStrategy(),
Expand All @@ -61,7 +62,7 @@ class SmbDeviceScannerObservable : Observable<ComputerParcelable>() {

private lateinit var observer: Observer<in ComputerParcelable>

private lateinit var disposable: Disposable
private var disposable: Disposable = Disposables.empty()

/**
* Stop discovering hosts. Notify containing strategies to stop, then stop the created
Expand All @@ -71,6 +72,9 @@ class SmbDeviceScannerObservable : Observable<ComputerParcelable>() {
if (!disposable.isDisposed) {
disposable.dispose()
}
discoverDeviceStrategies.forEach { strategy ->
strategy.onCancel()
}
observer.onComplete()
}

Expand Down
Loading