|
@@ -479,13 +479,6 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
unsetAllDrawerMenuItems();
|
|
|
}
|
|
|
|
|
|
- public void openMediaList() {
|
|
|
- SearchEvent searchEvent = new SearchEvent("image/%", SearchRemoteOperation.SearchType.PHOTO_SEARCH);
|
|
|
- MainApp.showOnlyFilesOnDevice(false);
|
|
|
-
|
|
|
- launchActivityForSearch(searchEvent, R.id.nav_gallery);
|
|
|
- }
|
|
|
-
|
|
|
private void onNavigationItemClicked(final MenuItem menuItem) {
|
|
|
setDrawerMenuItemChecked(menuItem.getItemId());
|
|
|
|
|
@@ -512,7 +505,7 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH),
|
|
|
menuItem.getItemId());
|
|
|
} else if (itemId == R.id.nav_gallery) {
|
|
|
- startPhotoSearch(menuItem);
|
|
|
+ startPhotoSearch(menuItem.getItemId());
|
|
|
} else if (itemId == R.id.nav_on_device) {
|
|
|
EventBus.getDefault().post(new ChangeMenuEvent());
|
|
|
showFiles(true);
|
|
@@ -604,11 +597,11 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
launchActivityForSearch(searchEvent, menuItem.getItemId());
|
|
|
}
|
|
|
|
|
|
- private void startPhotoSearch(MenuItem menuItem) {
|
|
|
+ public void startPhotoSearch(int id) {
|
|
|
SearchEvent searchEvent = new SearchEvent("image/%", SearchRemoteOperation.SearchType.PHOTO_SEARCH);
|
|
|
MainApp.showOnlyFilesOnDevice(false);
|
|
|
|
|
|
- launchActivityForSearch(searchEvent, menuItem.getItemId());
|
|
|
+ launchActivityForSearch(searchEvent, id);
|
|
|
}
|
|
|
|
|
|
private void handleSearchEvents(SearchEvent searchEvent, int menuItemId) {
|