use findActivity everywhere #15
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This only works if the surrounding Context is from an Activity, but when embedding in NewPipe proper, we are in a Fragment. So the cast will fail. Instead, let’s use the util function we already had that iterates through the `ContextWrapper`s until it finds an activity, and use that everywhere.
This works better with `ContextWrapper`s. I moved the relevant static functions into extension functions. We should think about whether we should just require `Activity` to be set on `Context` everywhere, because right now we require it on some of the code, but have defaults for other parts.
Profpatsch
force-pushed
the
findActivity-everywhere
branch
from
375ab60 to
4e4bb47
Compare
theScrabi
requested changes
Jan 3, 2025
| * | ||
| * @param default: the default value if there is no activity | ||
| * @param block: the block to call with the activity | ||
| */ |
There was a problem hiding this comment.
Consider adding @hide here, so this function does not show up on the KDoc documentation.
| /** Get the [Activity] from local context. Assumes the activity exists! | ||
| * @return the activity | ||
| * @throws NullPointerException if there is no Activity | ||
| */ |
There was a problem hiding this comment.
Consider adding @hide here, so this function does not show up on the KDoc documentation.
| } | ||
|
|
||
|
|
||
| @Composable |
There was a problem hiding this comment.
Consider adding @hide here, so this function does not show up on the KDoc documentation.
| @@ -298,10 +298,6 @@ class NewPlayerImpl( | |||
| mutableErrorFlow.emit(e) | |||
| } | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Useful cleanup, but if I'm nitpicky this code change should not be part of this PR.
I don't care too much about this though :P. However, I don't know how other devs feel about this. I'd say do it as you feel best with.
| @@ -58,15 +58,14 @@ internal suspend fun buildMediaSource( | |||
| ): MediaSource { | |||
| when (streamSelection) { | |||
| is SingleSelection -> { | |||
| val mediaItem = toMediaItem(streamSelection.item, streamSelection.stream, uniqueId) | |||
| val mediaItemWithMetadata = addMetadata(mediaItem, streamSelection.item) | ||
| return toMediaSource(mediaItemWithMetadata, streamSelection.stream) | ||
| } | ||
|
|
||
| is MultiSelection -> { | ||
| val mediaItems = ArrayList(streamSelection.streams.map { | ||
| toMediaItem( | ||
| streamSelection.item, |
| @@ -23,7 +23,7 @@ package net.newpipe.newplayer.logic; | |||
| import net.newpipe.newplayer.data.StreamSelection | |||
| import net.newpipe.newplayer.NewPlayer | |||
|
|
|||
| interface StreamExceptionResponse | |||
ShareASmile
added
enhancement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When adding NewPlayer to NewPipe, we call it from a Fragment, which will not have a direct Activity in Context, but a wrapper class. We already had a function for that but did not call it everywhere. This fixes that.
We should probably assume we can find an Activity everywhere in the player UI. Later.
Also adds two minor changes.