Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
import java.util.Collections;

public final class QueueItemMenuUtil {
private QueueItemMenuUtil() {
}

public static void openPopupMenu(final PlayQueue playQueue,
final PlayQueueItem item,
final View view,
Expand Down Expand Up @@ -55,6 +58,13 @@ public static void openPopupMenu(final PlayQueue playQueue,
() -> PlaylistCreationDialog.newInstance(d)
.show(fragmentManager, "QueueItemMenuUtil@append_playlist"));
return true;
case R.id.menu_item_channel_details:
// An intent must be used here.
// Opening with FragmentManager transactions is not working,
// as PlayQueueActivity doesn't use fragments.
NavigationHelper.openChannelFragmentUsingIntent(context, item.getServiceId(),
item.getUploaderUrl(), item.getUploader());
return true;
case R.id.menu_item_share:
shareText(context, item.getTitle(), item.getUrl(),
item.getThumbnailUrl());
Expand All @@ -65,6 +75,4 @@ public static void openPopupMenu(final PlayQueue playQueue,

popupMenu.show();
}

private QueueItemMenuUtil() { }
}
21 changes: 21 additions & 0 deletions app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,27 @@ public static void openVideoDetail(final Context context,
context.startActivity(intent);
}

/**
* Opens {@link ChannelFragment}.
* Use this instead of {@link #openChannelFragment(FragmentManager, int, String, String)}
* when no fragments are used / no FragmentManager is available.
* @param context
* @param serviceId
* @param url
* @param title
*/
public static void openChannelFragmentUsingIntent(final Context context,
final int serviceId,
final String url,
@NonNull final String title) {
final Intent intent = getOpenIntent(context, url, serviceId,
StreamingService.LinkType.CHANNEL);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(Constants.KEY_TITLE, title);

context.startActivity(intent);
}

public static void openMainActivity(final Context context) {
final Intent mIntent = new Intent(context, MainActivity.class);
mIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/menu/menu_play_queue_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<item
android:id="@+id/menu_item_append_playlist"
android:title="@string/append_playlist" />
<item
android:id="@+id/menu_item_channel_details"
android:title="@string/show_channel_details" />
<item
android:id="@+id/menu_item_share"
android:title="@string/share" />
Expand Down