fix(sample): fix computer ip discovery progress visibility on cancel

ArthurVimond · Feb 25, 2020 · 4a4186c · 4a4186c
1 parent 751386a
commit 4a4186c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sample/src/main/java/com/oscleton/sdk/sample/configuration/ConfigurationViewModel.kt b/sample/src/main/java/com/oscleton/sdk/sample/configuration/ConfigurationViewModel.kt
@@ -32,6 +32,7 @@ class ConfigurationViewModel : ViewModel() {
 
     val onComputerIPDiscoverySuccess: Observable<String> = OscletonSDK.instance.config.onComputerIPDiscoverySuccess
     val onComputerIPDiscoveryError: Observable<String> = OscletonSDK.instance.config.onComputerIPDiscoveryError
+    val onComputerIPDiscoveryCancel: Observable<Empty> = OscletonSDK.instance.config.onComputerIPDiscoveryCancel
 
     val discoveryIPButtonVisibility: LiveData<Int>
         get() = _discoveryIPButtonVisibility
@@ -76,8 +77,9 @@ class ConfigurationViewModel : ViewModel() {
                 .addTo(compositeDisposable)
 
         // Hide progress after discovery finish
-        config.onComputerIPDiscoverySuccess
-                .mergeWith(config.onComputerIPDiscoveryError)
+        config.onComputerIPDiscoverySuccess.map { true }
+                .mergeWith(config.onComputerIPDiscoveryError.map { true })
+                .mergeWith(config.onComputerIPDiscoveryCancel.map { true })
                 .subscribe {
                     _discoveryIPButtonVisibility.postValue(View.VISIBLE)
                     _stopDiscoveryButtonVisibility.postValue(View.GONE)