Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump NewPipeExtractor

This commit is contained in:
wb9688 2020-05-08 18:03:19 +02:00
parent 1096ec1c09
commit ae437b1510
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -158,7 +158,7 @@ dependencies {
exclude module: 'support-annotations' exclude module: 'support-annotations'
}) })
implementation 'com.github.Royosef:NewPipeExtractor:a4086617719e53b293efa1e8873799ba7714cb14' implementation 'com.github.TeamNewPipe:NewPipeExtractor:f3913e241e379adf0091319091e8f895c5fcfd07'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.23.0' testImplementation 'org.mockito:mockito-core:2.23.0'

6
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View File

@ -422,11 +422,13 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo>
break; break;
case R.id.detail_uploader_root_layout: case R.id.detail_uploader_root_layout:
if (TextUtils.isEmpty(currentInfo.getSubChannelUrl())) { if (TextUtils.isEmpty(currentInfo.getSubChannelUrl())) {
Log.w(TAG, "Can't open sub-channel because we got no channel URL");
if (!TextUtils.isEmpty(currentInfo.getUploaderUrl())) { if (!TextUtils.isEmpty(currentInfo.getUploaderUrl())) {
openChannel(currentInfo.getUploaderUrl(), currentInfo.getUploaderName()); openChannel(currentInfo.getUploaderUrl(), currentInfo.getUploaderName());
} }
if (DEBUG) {
Log.i(TAG, "Can't open sub-channel because we got no channel URL");
}
} else { } else {
openChannel(currentInfo.getSubChannelUrl(), openChannel(currentInfo.getSubChannelUrl(),
currentInfo.getSubChannelName()); currentInfo.getSubChannelName());

20
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
View File

@ -423,18 +423,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
switch (v.getId()) { switch (v.getId()) {
case R.id.sub_channel_avatar_view: case R.id.sub_channel_avatar_view:
case R.id.sub_channel_title_view: case R.id.sub_channel_title_view:
if (TextUtils.isEmpty(currentInfo.getSubChannelUrl())) { if (!TextUtils.isEmpty(currentInfo.getParentChannelUrl())) {
Log.w(TAG, "Can't open sub-channel because we got no channel URL");
} else {
try { try {
NavigationHelper.openChannelFragment( NavigationHelper.openChannelFragment(getFragmentManager(),
getFragmentManager(), currentInfo.getServiceId(), currentInfo.getParentChannelUrl(),
currentInfo.getServiceId(), currentInfo.getParentChannelName());
currentInfo.getSubChannelUrl(),
currentInfo.getSubChannelName());
} catch (Exception e) { } catch (Exception e) {
ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e); ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
} }
} else if (DEBUG) {
Log.i(TAG, "Can't open parent channel because we got no channel URL");
} }
break; break;
} }
@ -463,7 +461,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
ImageDisplayConstants.DISPLAY_BANNER_OPTIONS); ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
IMAGE_LOADER.displayImage(result.getAvatarUrl(), headerAvatarView, IMAGE_LOADER.displayImage(result.getAvatarUrl(), headerAvatarView,
ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS); ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
IMAGE_LOADER.displayImage(result.getSubChannelAvatarUrl(), headerSubChannelAvatarView, IMAGE_LOADER.displayImage(result.getParentChannelAvatarUrl(), headerSubChannelAvatarView,
ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS); ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
headerSubscribersTextView.setVisibility(View.VISIBLE); headerSubscribersTextView.setVisibility(View.VISIBLE);
@ -474,10 +472,10 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
headerSubscribersTextView.setText(R.string.subscribers_count_not_available); headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
} }
if (!TextUtils.isEmpty(currentInfo.getSubChannelName())) { if (!TextUtils.isEmpty(currentInfo.getParentChannelName())) {
headerSubChannelTitleView.setText(String.format( headerSubChannelTitleView.setText(String.format(
getString(R.string.channel_created_by), getString(R.string.channel_created_by),
currentInfo.getSubChannelName()) currentInfo.getParentChannelName())
); );
headerSubChannelTitleView.setVisibility(View.VISIBLE); headerSubChannelTitleView.setVisibility(View.VISIBLE);
headerSubChannelAvatarView.setVisibility(View.VISIBLE); headerSubChannelAvatarView.setVisibility(View.VISIBLE);