From 90f0eb3c6cd0c492a0b4a56bee48149d28fff819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Tue, 9 Aug 2016 17:28:49 +0200 Subject: [PATCH] Check extension on filename instead of media title --- .../org/videolan/vlc/media/MediaWrapper.java | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java b/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java index b8095002d..90efbcdc6 100644 --- a/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java +++ b/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java @@ -161,22 +161,17 @@ public class MediaWrapper implements Parcelable { if (mType != TYPE_ALL) return; - String fileExt = null; - int dotIndex = mTitle != null ? mTitle.lastIndexOf(".") : -1; - - if (dotIndex != -1) { - fileExt = mTitle.substring(dotIndex).toLowerCase(Locale.ENGLISH); - } else { - final int index = mUri.toString().indexOf('?'); - String location; - if (index == -1) - location = mUri.toString(); - else - location = mUri.toString().substring(0, index); - dotIndex = location.lastIndexOf("."); - if (dotIndex != -1) - fileExt = location.substring(dotIndex).toLowerCase(Locale.ENGLISH); - } + String fileExt = null, filename = mUri.getLastPathSegment(); + if (filename == null) + return; + final int index = filename.indexOf('?'); + if (index != -1) + filename = filename.substring(0, index); + + index = filename.lastIndexOf("."); + + if (index != -1) + fileExt = filename.substring(index).toLowerCase(Locale.ENGLISH); if (!TextUtils.isEmpty(fileExt)) { if (Extensions.VIDEO.contains(fileExt)) { -- GitLab