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

Prevent NPEs

parent 3da47e58
No related branches found
No related tags found
No related merge requests found
......@@ -59,12 +59,13 @@ public abstract class VlcDialog<T extends Dialog, B extends android.databinding.
@NonNull
@Override
public android.app.Dialog onCreateDialog(Bundle savedInstanceState) {
mVlcDialog.setContext(this);
AppCompatDialog dialog = new AppCompatDialog(getActivity(), getTheme());
dialog.setTitle(mVlcDialog.getTitle());
dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
if (mVlcDialog != null) {
mVlcDialog.setContext(this);
dialog.setTitle(mVlcDialog.getTitle());
}
return dialog;
}
......
......@@ -164,15 +164,17 @@ public class MediaItemDetailsFragment extends DetailsFragment implements Playbac
MediaUtils.getSubs(getActivity(), media);
break;
case ID_PLAY_ALL:
int position = -1;
for (int i= 0; i < mediaList.size(); ++i)
if (media.equals(mediaList.get(i)))
position = i;
Activity activity = getActivity();
MediaUtils.openList(activity, mediaList, position);
if (media.getType() == MediaWrapper.TYPE_AUDIO)
getActivity().startActivity(new Intent(activity, AudioPlayerActivity.class));
getActivity().finish();
if (mediaList != null) {
int position = -1;
for (int i= 0; i < mediaList.size(); ++i)
if (media.equals(mediaList.get(i)))
position = i;
Activity activity = getActivity();
MediaUtils.openList(activity, mediaList, position);
if (media.getType() == MediaWrapper.TYPE_AUDIO)
getActivity().startActivity(new Intent(activity, AudioPlayerActivity.class));
getActivity().finish();
}
break;
case ID_PLAY_FROM_START:
VideoPlayerActivity.start(getActivity(), media.getUri(), 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