be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Polished Results

This commit is contained in:
Peter Hindes 2019-10-15 08:40:51 -06:00
parent c68c35e084
commit 4106645d6e
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
View File

@ -1,14 +1,19 @@
package org.schabi.newpipe.database.playlist.model; package org.schabi.newpipe.database.playlist.model;
import android.text.TextUtils;
import android.util.Log;
import androidx.room.ColumnInfo; import androidx.room.ColumnInfo;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.Ignore; import androidx.room.Ignore;
import androidx.room.Index; import androidx.room.Index;
import androidx.room.PrimaryKey; import androidx.room.PrimaryKey;
import org.schabi.newpipe.BuildConfig;
import org.schabi.newpipe.database.playlist.PlaylistLocalItem; import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
import org.schabi.newpipe.extractor.playlist.PlaylistInfo; import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.Constants;
import org.w3c.dom.Text;
import static org.schabi.newpipe.database.LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM; import static org.schabi.newpipe.database.LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM;
import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_NAME; import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_NAME;
@ -72,19 +77,25 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
@Ignore @Ignore
public boolean isIdenticalTo(final PlaylistInfo info) { public boolean isIdenticalTo(final PlaylistInfo info) {
String TAG = "isIdenticalTo";
boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
/* /*
* Returns boolean comparing the online playlist and the local copy. * Returns boolean comparing the online playlist and the local copy.
* (False if info changed such as playlist name or track count) * (False if info changed such as playlist name or track count)
* [Note that
* getUploader().equals(info.getUploaderName())
* crashes the app on playlists that are auto-generated with no creator,
* please use
* getUploader() == info.getUploaderName()
* instead as it will work with blank names (Null value if I remember correctly).
*/ */
return getServiceId() == info.getServiceId() && getName().equals(info.getName()) && 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 = "We compared uploaders: "+returnMe;
} else {
uploaderAction = "No Uploader";
}
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()) && getUploader() == info.getUploaderName(); getThumbnailUrl().equals(info.getThumbnailUrl());
if (DEBUG) Log.d(TAG, TAG+" Called With Result: "+returnMe+". And Uploader Action: "+uploaderAction);
return returnMe;
} }
public long getUid() { public long getUid() {

6
app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
View File

@ -259,7 +259,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
animateView(headerRootLayout, true, 100); animateView(headerRootLayout, true, 100);
animateView(headerUploaderLayout, true, 300); animateView(headerUploaderLayout, true, 300);
headerUploaderLayout.setOnClickListener(null); headerUploaderLayout.setOnClickListener(null);
if (!TextUtils.isEmpty(result.getUploaderName())) { if (!TextUtils.isEmpty(result.getUploaderName())) { // If we have an uploader : Put them into the ui
//headerUploaderLayout.setVisibility(View.VISIBLE);
headerUploaderName.setText(result.getUploaderName()); headerUploaderName.setText(result.getUploaderName());
if (!TextUtils.isEmpty(result.getUploaderUrl())) { if (!TextUtils.isEmpty(result.getUploaderUrl())) {
headerUploaderLayout.setOnClickListener(v -> { headerUploaderLayout.setOnClickListener(v -> {
@ -273,6 +274,9 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
} }
}); });
} }
} else { // Else : hide the uploader section
//headerUploaderLayout.setVisibility(View.INVISIBLE);
headerUploaderName.setText("Auto-Generated");
} }
playlistCtrl.setVisibility(View.VISIBLE); playlistCtrl.setVisibility(View.VISIBLE);