Merge branch 'dev' into playback_state_list

This commit is contained in:
Vasily 2019-06-23 20:13:20 +03:00
commit ea8bdd8835
124 changed files with 7962 additions and 6669 deletions

View file

@ -1210,7 +1210,7 @@ public class VideoDetailFragment
downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
downloadDialog.show(getActivity().getSupportFragmentManager(), "downloadDialog");
} catch (Exception e) {
ErrorActivity.ErrorInfo info = ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
ServiceList.all()