Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Some fixes

This commit is contained in:
Thomas 2020-11-21 18:54:54 +01:00
parent 7ceb04d548
commit 14efbdd08f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
View File

@ -560,8 +560,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
userHistory.setCurrentTime(totalSeconds * 1000); userHistory.setCurrentTime(totalSeconds * 1000);
peertube.setUserHistory(userHistory); peertube.setUserHistory(userHistory);
} }
SearchVM viewModelSearch = new ViewModelProvider(PeertubeActivity.this).get(SearchVM.class); TimelineVM viewModelTimeline = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
viewModelSearch.getVideos("0", peertube.getEmbedUrl()).observe(PeertubeActivity.this, this::manageVIewVideos); viewModelTimeline.getVideo(peertubeInstance, peertube.getUuid(), false).observe(PeertubeActivity.this, this::manageVIewVideo);
} else { } else {
Helper.forwardToAnotherApp(PeertubeActivity.this, intent); Helper.forwardToAnotherApp(PeertubeActivity.this, intent);
finish(); finish();
@ -719,7 +719,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
i++; i++;
} }
nextVideo = apiResponse.getPeertubes().get(i); nextVideo = apiResponse.getPeertubes().get(i);
if (!playedVideos.contains(nextVideo.getId()) && player != null) { if (!playedVideos.contains(nextVideo.getId()) && player != null && nextVideo.getFileUrl(null, PeertubeActivity.this) != null) {
MediaItem mediaItem = new MediaItem.Builder().setUri(Uri.parse(nextVideo.getFileUrl(null, PeertubeActivity.this))).build(); MediaItem mediaItem = new MediaItem.Builder().setUri(Uri.parse(nextVideo.getFileUrl(null, PeertubeActivity.this))).build();
player.addMediaItem(mediaItem); player.addMediaItem(mediaItem);
} }