Fix after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-387
+386

src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java

@@ -80,7 +80,7 @@ public class FileDisplayActivityIT extends AbstractIT {
     }
 
     @Test
-    public void showShares() throws InterruptedException {
+    public void showShares() {
         assertTrue(new CreateFolderRemoteOperation("/shareToAdmin/", true).execute(client).isSuccess());
         assertTrue(new CreateFolderRemoteOperation("/shareToGroup/", true).execute(client).isSuccess());
         assertTrue(new CreateFolderRemoteOperation("/shareViaLink/", true).execute(client).isSuccess());
@@ -118,8 +118,7 @@ public class FileDisplayActivityIT extends AbstractIT {
         getInstrumentation().waitForIdleSync();
 
         EventBus.getDefault().post(new SearchEvent("",
-                                                   SearchRemoteOperation.SearchType.SHARED_FILTER,
-                                                   SearchEvent.UnsetType.UNSET_BOTTOM_NAV_BAR));
+                                                   SearchRemoteOperation.SearchType.SHARED_FILTER));
 
         getInstrumentation().waitForIdleSync();
 

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -469,7 +469,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                 UserInfoActivity.openAccountRemovalConfirmationDialog(getAccount(), getSupportFragmentManager());
                 break;
             case R.id.nav_shared:
-                handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.SHARED_SEARCH),
+                handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.SHARED_FILTER),
                                    menuItem.getItemId());
                 break;
             case R.id.nav_recently_modified:

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

@@ -191,7 +191,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
     protected SearchType currentSearchType;
     protected boolean searchFragment;
     protected SearchEvent searchEvent;
-    protected AsyncTask remoteOperationAsyncTask;
+    protected AsyncTask<Void, Void, Boolean> remoteOperationAsyncTask;
     protected String mLimitToMimeType;
 
     @Inject DeviceInfo deviceInfo;
@@ -1591,7 +1591,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
             }
         };
 
-        remoteOperationAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, true);
+        remoteOperationAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     @Subscribe(threadMode = ThreadMode.BACKGROUND)