Show only files&folders in current folder

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1129,12 +1129,7 @@ public class FileDisplayActivity extends HookActivity
         OCFileListFragment ocFileListFragment = getListOfFilesFragment();
         if (ocFileListFragment != null) {
             if (!mSyncInProgress) {
-                if (!TextUtils.isEmpty(searchQuery) || (searchView != null &&
-                        !TextUtils.isEmpty(searchView.getQuery().toString()))) {
-                    ocFileListFragment.setEmptyListMessage(true);
-                } else {
                     ocFileListFragment.setEmptyListMessage(false);
-                }
             } else {
                 ocFileListFragment.setEmptyListLoadingMessage();
             }

src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -482,7 +482,7 @@ public class FileListListAdapter extends BaseAdapter {
             if (!TextUtils.isEmpty(constraint)) {
                 for (int i = 0; i < mFilesAll.size(); i++) {
                     OCFile currentFile = mFilesAll.get(i);
-                    if (currentFile.getRemotePath().startsWith(currentDirectory.getRemotePath()) &&
+                    if (currentFile.getRemotePath().replace(currentFile.getFileName(), "").equals(currentDirectory.getRemotePath()) &&
                             currentFile.getFileName().toLowerCase().contains(constraint) &&
                             !ocFileVector.contains(currentFile)) {
                         ocFileVector.add(currentFile);

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -54,7 +54,6 @@ import com.owncloud.android.ui.ExtendedListView;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
 import com.owncloud.android.ui.adapter.FileListListAdapter;
-import com.owncloud.android.ui.adapter.FilterableListAdapter;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 
 import java.util.ArrayList;