Commit f84798f2 authored by Geoffrey Métais's avatar Geoffrey Métais

Fix NPE in video player

(cherry picked from commit ca392f8a)
parent 7871e880
......@@ -1541,7 +1541,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
if (isFinishing())
return;
//We may not have the permission to access files
if (TextUtils.equals(mUri.getScheme(), "file") &&
if (AndroidUtil.isMarshMallowOrLater() && mUri != null &&
TextUtils.equals(mUri.getScheme(), "file") &&
!Permissions.canReadStorage()) {
Permissions.checkReadStoragePermission(this, true);
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment