Merge pull request #9547 from nextcloud/fix/favorite-state-lost

OCFileListFragment: don't delete search event if resuming a search fragment

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -360,10 +360,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
             registerFabListener();
         }
 
-        if (getArguments() == null) {
-            searchEvent = null;
-        } else {
-            searchEvent = Parcels.unwrap(getArguments().getParcelable(OCFileListFragment.SEARCH_EVENT));
+        if (!searchFragment) { // do not touch search event if previously searched
+            if (getArguments() == null) {
+                searchEvent = null;
+            } else {
+                searchEvent = Parcels.unwrap(getArguments().getParcelable(OCFileListFragment.SEARCH_EVENT));
+            }
         }
         prepareCurrentSearch(searchEvent);
 
@@ -385,10 +387,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
         setTitle();
 
-        if (searchEvent != null) {
-            onMessageEvent(searchEvent);
-        }
-
         FragmentActivity fragmentActivity;
         if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity) {
             FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) fragmentActivity;
@@ -1543,7 +1541,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                     if (remoteOperationResult.isSuccess() && remoteOperationResult.getResultData() != null
                         && !isCancelled() && searchFragment) {
                         searchEvent = event;
-                        
+
                         if (remoteOperationResult.getResultData() == null || ((List) remoteOperationResult.getResultData()).isEmpty()) {
                             setEmptyView(event);
                         } else {