refactor: Use Observable.doOnTerminate() (from rxjava3)

ghusta · Jan 3, 2024 · 513995f · 513995f
1 parent 4b0ceb3
commit 513995f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/src/main/java/fr/husta/android/dockersearch/MainActivity.java b/app/src/main/java/fr/husta/android/dockersearch/MainActivity.java
@@ -272,7 +272,8 @@ public boolean onQueryTextSubmit(String query)
         Disposable disposable = dockerRegistryClient.searchImagesAsync(query)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .doOnSubscribe(data -> progressBar.show())
+                .doOnSubscribe(disp1 -> progressBar.show())
+                .doOnTerminate(() -> progressBar.hide())
                 .subscribe(data -> {
                             Log.d(TAG, "searchImagesAsync.onResponse: returned " + data.getResults().size() + " out of " + data.getNumResults());
                             data.getResults().sort(new DefaultImageSearchComparator());
@@ -291,10 +292,8 @@ public boolean onQueryTextSubmit(String query)
                         },
                         throwable -> {
                             Log.e(TAG, throwable.getMessage(), throwable);
-                            progressBar.hide();
                             Toast.makeText(MainActivity.this, getString(R.string.msg_error, throwable.getMessage()), Toast.LENGTH_LONG).show();
-                        },
-                        () -> progressBar.hide());
+                        });
         disposables.add(disposable);
 
         // fermer le clavier de saisie