[Android] Revert "MediaWrapper: fix issue with smb title being empty"

Duncan McNamara git at videolan.org
Wed Jan 25 13:09:17 UTC 2023


vlc-android | branch: 3.5.x | Duncan McNamara <dcn.mcnamara at gmail.com> | Wed Jan 25 11:43:26 2023 +0100| [5379ed30e2d8e4ecdbe1a50f0237d8e8ac1353b2] | committer: Nicolas Pomepuy

Revert "MediaWrapper: fix issue with smb title being empty"

This reverts commit 1cf5481d90740cdb5296bb9fe37430cbac7bee84.

This commit is based on 82936d22 which is being reverted for causing
issues when displaying network share titles


(cherry picked from commit a2c2011aed634a1b8c862357a0ea874477a257a9)

> https://code.videolan.org/videolan/vlc-android/commit/5379ed30e2d8e4ecdbe1a50f0237d8e8ac1353b2
---

 .../src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java b/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java
index b2f38aafa1..d81e60b15a 100644
--- a/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java
+++ b/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java
@@ -391,7 +391,7 @@ public abstract class MediaWrapper extends MediaLibraryItem implements Parcelabl
     private String updateTitleMeta(IMedia media) {
         String libvlcTitle = getMetaId(media, mTitle, Media.Meta.Title, true);
         String fileName = getFileName();
-        if (TextUtils.isEmpty(fileName) || fileName.equals(libvlcTitle))
+        if (!TextUtils.isEmpty(libvlcTitle) && !TextUtils.isEmpty(fileName) && !libvlcTitle.equals(fileName))
             return libvlcTitle;
         return getTitle();
     }



More information about the Android mailing list