Skip to content
Snippets Groups Projects
Commit 0e3cd395 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Do not stop actionmode too early

parent d6177c59
No related branches found
No related tags found
No related merge requests found
......@@ -179,7 +179,6 @@ public class HistoryFragment extends MediaBrowserFragment implements IRefreshabl
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
stopActionMode();
switch (item.getItemId()) {
case R.id.action_history_play:
MediaUtils.openList(getActivity(), mHistoryAdapter.getSelection(), 0);
......@@ -191,8 +190,10 @@ public class HistoryFragment extends MediaBrowserFragment implements IRefreshabl
showInfoDialog(mHistoryAdapter.getSelection().get(0));
break;
default:
stopActionMode();
return false;
}
stopActionMode();
return true;
}
......
......@@ -75,11 +75,11 @@ public abstract class BaseAudioBrowser extends MediaBrowserFragment implements I
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
stopActionMode();
List<MediaLibraryItem> list = getCurrentAdapter().getSelection();
ArrayList<MediaWrapper> tracks = new ArrayList<>();
for (MediaLibraryItem mediaItem : list)
tracks.addAll(Arrays.asList(mediaItem.getTracks(mMediaLibrary)));
stopActionMode();
switch (item.getItemId()) {
case R.id.action_mode_audio_play:
mService.load(tracks, 0);
......@@ -91,10 +91,10 @@ public abstract class BaseAudioBrowser extends MediaBrowserFragment implements I
UiTools.addToPlaylist(getActivity(), tracks);
break;
case R.id.action_mode_audio_info:
showInfoDialog((MediaWrapper) getCurrentAdapter().getSelection().get(0));
showInfoDialog((MediaWrapper) list.get(0));
break;
case R.id.action_mode_audio_set_song:
AudioUtil.setRingtone((MediaWrapper) getCurrentAdapter().getSelection().get(0), getActivity());
AudioUtil.setRingtone((MediaWrapper) list.get(0), getActivity());
break;
default:
return false;
......
......@@ -661,7 +661,6 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
stopActionMode();
switch (item.getItemId()) {
case R.id.action_mode_file_play:
mService.load(mAdapter.getSelection(), 0);
......@@ -680,8 +679,10 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
showMediaInfo(mAdapter.getSelection().get(0));
break;
default:
stopActionMode();
return false;
}
stopActionMode();
return true;
}
......
......@@ -514,7 +514,6 @@ public class VideoGridFragment extends MediaBrowserFragment implements MediaUpda
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
stopActionMode();
switch (item.getItemId()) {
case R.id.action_video_play:
MediaUtils.openList(getActivity(), mVideoAdapter.getSelection(), 0);
......@@ -539,8 +538,10 @@ public class VideoGridFragment extends MediaBrowserFragment implements MediaUpda
MediaUtils.openList(getActivity(), list, 0);
break;
default:
stopActionMode();
return false;
}
stopActionMode();
return true;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment