[Android] Fix NullPointerException when comparing a MediaWrapper without tag

Nicolas Pomepuy git at videolan.org
Mon Jun 1 09:41:13 UTC 2026


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Mon Jun  1 08:31:24 2026 +0200| [5b69fe46b9c020f4700f921ce37c2f03a8ea9b48] | committer: Nicolas Pomepuy

Fix NullPointerException when comparing a MediaWrapper without tag

> https://code.videolan.org/videolan/vlc-android/commit/5b69fe46b9c020f4700f921ce37c2f03a8ea9b48
---

 .../org/videolan/medialibrary/interfaces/media/MediaWrapper.java    | 6 +++++-
 1 file changed, 5 insertions(+), 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 592a739793..3796a29386 100644
--- a/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java
+++ b/medialibrary/src/org/videolan/medialibrary/interfaces/media/MediaWrapper.java
@@ -255,7 +255,11 @@ public abstract class MediaWrapper extends MediaLibraryItem implements Parcelabl
 
     public boolean equals(MediaWrapper obj) {
         long otherId = obj.getId();
-        if (otherId != 0L && getId() != 0L && otherId == getId() &&  (mTag == null || obj.getTag().equals(mTag))) return true;
+        if (
+                otherId != 0L && getId() != 0L
+                        && otherId == getId()
+                        && ((mTag == null && obj.getTag() == null) || (obj.getTag() != null && obj.getTag().equals(mTag)))
+        ) return true;
         final Uri otherUri = obj.getUri();
         return !(mUri == null || otherUri == null) && (mUri == otherUri || mUri.equals(otherUri));
     }



More information about the Android mailing list