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-09-26 19:36:10 +02:00
parent 9c476037ef
commit 9f25405983
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@ public class PeertubeActivity extends AppCompatActivity {
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instance = Helper.getLiveInstance(PeertubeActivity.this); String instance = Helper.getLiveInstance(PeertubeActivity.this);
Account account = new AccountDAO(PeertubeActivity.this, db).getUniqAccount(userId, instance); Account account = new AccountDAO(PeertubeActivity.this, db).getUniqAccount(userId, instance);
Helper.loadGiF(PeertubeActivity.this, account.getAvatar().getPath(), my_pp); Helper.loadGiF(PeertubeActivity.this, account.getAvatar()!=null?account.getAvatar().getPath():null, my_pp);
if (Helper.isTablet(PeertubeActivity.this)) { if (Helper.isTablet(PeertubeActivity.this)) {

2
app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java
View File

@ -241,7 +241,7 @@ public class ShowChannelActivity extends AppCompatActivity {
manageNotes(channel); manageNotes(channel);
Helper.loadGiF(ShowChannelActivity.this, channel.getAvatar().getPath(), account_pp); Helper.loadGiF(ShowChannelActivity.this, channel.getAvatar()!=null?channel.getAvatar().getPath():null, account_pp);
//Follow button //Follow button
String target = channel.getAcct(); String target = channel.getAcct();

6
app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java
View File

@ -203,7 +203,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
if (!flag_loading) { if (!flag_loading) {
flag_loading = true; flag_loading = true;
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
if( type != TimelineVM.TimelineType.USER_VIDEOS){ if( type == TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}else { }else {
viewModelFeeds.getVideos(type, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelFeeds.getVideos(type, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
@ -226,7 +226,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
if (!flag_loading) { if (!flag_loading) {
flag_loading = true; flag_loading = true;
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
if( type != TimelineVM.TimelineType.USER_VIDEOS){ if( type == TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelFeeds.getVideosInChannel(channelId, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
}else { }else {
viewModelFeeds.getVideos(type, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse)); viewModelFeeds.getVideos(type, max_id).observe(DisplayVideosFragment.this.requireActivity(), apiResponse -> manageVIewVideos(apiResponse));
@ -401,7 +401,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
} }
if (search_peertube == null) { //Not a Peertube search if (search_peertube == null) { //Not a Peertube search
if( type != TimelineVM.TimelineType.USER_VIDEOS){ if( type == TimelineVM.TimelineType.USER_VIDEOS){
viewModelFeeds.getVideosInChannel(channelId, "0").observe(this.requireActivity(), this::manageVIewVideos); viewModelFeeds.getVideosInChannel(channelId, "0").observe(this.requireActivity(), this::manageVIewVideos);
}else { }else {
viewModelFeeds.getVideos(type, "0").observe(this.requireActivity(), this::manageVIewVideos); viewModelFeeds.getVideos(type, "0").observe(this.requireActivity(), this::manageVIewVideos);