From 82ac2b32235c4057a130c34a7435bd42b2eaf4eb Mon Sep 17 00:00:00 2001
From: inorichi <chibilen@gmail.com>
Date: Tue, 13 Oct 2015 00:15:03 +0200
Subject: [PATCH] Simplify if/else

---
 .../presenter/CatalogueListPresenter.java     | 22 ++++++-------------
 .../eu/kanade/mangafeed/sources/Source.java   |  1 +
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java b/app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java
index c879fd4ab0..e8526ce42d 100644
--- a/app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java
+++ b/app/src/main/java/eu/kanade/mangafeed/presenter/CatalogueListPresenter.java
@@ -125,31 +125,23 @@ public class CatalogueListPresenter extends BasePresenter {
         // If going to search mode
         else if (mSearchName.equals("") && !query.equals("")) {
             mSearchMode = true;
-            mSearchName = query;
-            adapter.setItems(new ArrayList<>());
-            getMangasFromSearch(1);
         }
         // If going to normal mode
         else if (!mSearchName.equals("") && query.equals("")) {
             mSearchMode = false;
-            mSearchName = query;
-            adapter.setItems(new ArrayList<>());
-            getMangasFromSource(1);
-        }
-        // If query changes
-        else {
-            mSearchName = query;
-            adapter.setItems(new ArrayList<>());
-            getMangasFromSearch(1);
         }
+
+        mSearchName = query;
+        adapter.getItems().clear();
+        loadMoreMangas(1);
         view.setScrollListener();
     }
 
     public void loadMoreMangas(int page) {
-        if (!mSearchMode) {
-            getMangasFromSource(page);
-        } else {
+        if (mSearchMode) {
             getMangasFromSearch(page);
+        } else {
+            getMangasFromSource(page);
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/mangafeed/sources/Source.java b/app/src/main/java/eu/kanade/mangafeed/sources/Source.java
index f3c1443442..9f2653f9ee 100644
--- a/app/src/main/java/eu/kanade/mangafeed/sources/Source.java
+++ b/app/src/main/java/eu/kanade/mangafeed/sources/Source.java
@@ -40,6 +40,7 @@ public abstract class Source {
                 .flatMap(response -> Observable.just(parsePopularMangasFromHtml(response)));
     }
 
+    // Get mangas from the source with a query
     public Observable<List<Manga>> searchMangasFromNetwork(String query, int page) {
         return mNetworkService
                 .getStringResponse(getSearchUrl(query, page), mNetworkService.NULL_CACHE_CONTROL, mRequestHeaders)