From 9999f37869b8808fcb58fdd66f0dcdd6bb797f31 Mon Sep 17 00:00:00 2001
From: Martijn Brekhof <m.brekhof@gmail.com>
Date: Tue, 28 Aug 2018 21:50:07 +0200
Subject: [PATCH] Fixed searchClickBackTest for MoviesActivity tests

---
 .../xbmc/kore/ui/AbstractCursorListFragment.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java b/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java
index ba87aed..e8eb1fc 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java
@@ -75,6 +75,7 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 	private boolean supportsSearch;
 
 	private SearchView searchView;
+	private boolean isPaused;
 
 	abstract protected void onListItemClicked(View view);
 	abstract protected CursorLoader createCursorLoader();
@@ -99,7 +100,6 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 	@Override
 	public void onActivityCreated (Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-
 		getLoaderManager().initLoader(LOADER, null, this);
 	}
 
@@ -113,12 +113,14 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 	public void onResume() {
 		bus.register(this);
 		super.onResume();
+		isPaused = false;
 	}
 
 	@Override
 	public void onPause() {
 		bus.unregister(this);
 		super.onPause();
+		isPaused = true;
 	}
 
 	@Override
@@ -283,6 +285,13 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 			return true;
 		}
 
+		/**
+		 * When this fragment is paused, onQueryTextChange is called with an empty string.
+		 * This causes problems restoring the list fragment when returning.
+		 */
+		if (isPaused)
+			return true;
+
 		searchFilter = newText;
 
 		restartLoader();
@@ -310,7 +319,6 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 	/** {@inheritDoc} */
 	@Override
 	public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
-		loaderLoading = false;
 		((RecyclerViewCursorAdapter) getAdapter()).swapCursor(cursor);
 		if (TextUtils.isEmpty(searchFilter)) {
 			// To prevent the empty text from appearing on the first load, set it now
@@ -353,7 +361,7 @@ public abstract class AbstractCursorListFragment extends AbstractListFragment
 			searchView = (SearchView) MenuItemCompat.getActionView(searchMenuItem);
 			searchView.setOnQueryTextListener(this);
 			searchView.setQueryHint(getString(R.string.action_search));
-			if ((savedSearchFilter != null) && (!TextUtils.isEmpty(savedSearchFilter))){
+			if (!TextUtils.isEmpty(savedSearchFilter)) {
 				searchMenuItem.expandActionView();
 				searchView.setQuery(savedSearchFilter, false);
 				//noinspection RestrictedApi