Much Simpler Fix

This commit is contained in:
Peter Hindes 2019-10-15 09:11:04 -06:00
parent 49db47c12c
commit df2bb228c5
1 changed files with 2 additions and 9 deletions

View File

@ -83,17 +83,10 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
* (False if info changed such as playlist name or track count) * (False if info changed such as playlist name or track count)
*/ */
boolean returnMe = true; boolean returnMe = true;
String uploaderAction = "";
if (!TextUtils.isEmpty(getUploader()) || !TextUtils.isEmpty(info.getUploaderName())) { // We have an uploader, add it to the comparison
returnMe &= getUploader().equals(info.getUploaderName()); // Use .equals for uploader names
uploaderAction = "compared uploaders: "+returnMe;
} else {
uploaderAction = "no uploader";
}
returnMe &= getServiceId() == info.getServiceId() && getName().equals(info.getName()) && returnMe &= getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) && getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
getThumbnailUrl().equals(info.getThumbnailUrl()); getThumbnailUrl().equals(info.getThumbnailUrl()) && TextUtils.equals(getUploader(), info.getUploaderName());
if (DEBUG) Log.d(TAG, TAG+"() called with result: returnMe = "+returnMe+". and uploaderAction: "+uploaderAction); if (DEBUG) Log.d(TAG, TAG+"() called with result: returnMe = "+returnMe);
return returnMe; return returnMe;
} }