Browse Source

Proper crash fix for the NullPointerException triggered by a race condition

The fix made in 65cac21c98
was not working because MediaWrapperImpl was overriding the
getTitle method. The useless override has been removed
3.4.x
Nicolas Pomepuy 5 years ago
parent
commit
e42fa88be7
  1. 16
      medialibrary/src/org/videolan/medialibrary/media/MediaWrapperImpl.java

16
medialibrary/src/org/videolan/medialibrary/media/MediaWrapperImpl.java

@ -25,7 +25,6 @@ package org.videolan.medialibrary.media;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Parcel;
import android.text.TextUtils;
import org.videolan.libvlc.interfaces.IMedia;
import org.videolan.medialibrary.Tools;
@ -78,21 +77,6 @@ public class MediaWrapperImpl extends MediaWrapper {
mArtist = artist;
}
@Override
public String getTitle() {
if (!TextUtils.isEmpty(mDisplayTitle))
return mDisplayTitle;
if (!TextUtils.isEmpty(mTitle))
return mTitle;
String fileName = getFileName();
if (fileName == null)
return "";
int end = fileName.lastIndexOf(".");
if (end <= 0)
return fileName;
return fileName.substring(0, end);
}
public String getReferenceArtist() {
return mAlbumArtist == null ? mArtist : mAlbumArtist;
}

Loading…
Cancel
Save