Fix a crash when user displays favorites when no movie is selected

esoxjem · Jun 1, 2018 · 162518d · 162518d
1 parent 7da6ea9
commit 162518d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingPresenterImpl.java b/app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingPresenterImpl.java
@@ -43,6 +43,11 @@ private void displayMovies() {
         fetchSubscription = moviesInteractor.fetchMovies(currentPage)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
+                .doFinally(() -> {
+                    if (!EspressoIdlingResource.getIdlingResource().isIdleNow()) {
+                        EspressoIdlingResource.decrement(); // Set app as idle.
+                    }
+                })
                 .subscribe(this::onMovieFetchSuccess, this::onMovieFetchFailed);
     }
 
@@ -69,7 +74,6 @@ private void showLoading() {
     }
 
     private void onMovieFetchSuccess(List<Movie> movies) {
-        EspressoIdlingResource.decrement();
         if (moviesInteractor.isPaginationSupported()) {
             loadedMovies.addAll(movies);
         } else {
@@ -81,7 +85,6 @@ private void onMovieFetchSuccess(List<Movie> movies) {
     }
 
     private void onMovieFetchFailed(Throwable e) {
-        EspressoIdlingResource.decrement();
         view.loadingFailed(e.getMessage());
     }