Skip to content

android: make popup resources package-safe for FOSS builds #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beeemT wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −3
Open

android: make popup resources package-safe for FOSS builds #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion android/app/src/main/java/me/kavishdevar/librepods/presentation/overlays/IslandWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,12 @@ class IslandWindow(private val context: Context) {
}

val videoView = islandView.findViewById<VideoView>(R.id.island_video_view)
val videoUri = "android.resource://me.kavishdevar.librepods/${R.raw.island}".toUri()
val videoUri = "android.resource://${context.packageName}/${R.raw.island}".toUri()
videoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE)
videoView.setOnErrorListener { _, what, extra ->
e("IslandWindow", "Error playing island video: what=$what extra=$extra")
true
}
videoView.setVideoURI(videoUri)
videoView.setOnPreparedListener { mediaPlayer ->
mediaPlayer.isLooping = true
Expand Down
6 changes: 5 additions & 1 deletion android/app/src/main/java/me/kavishdevar/librepods/presentation/overlays/PopupWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ class PopupWindow(

val vid = mView.findViewById<VideoView>(R.id.video)
vid.setAudioFocusRequest(AudioManager.AUDIOFOCUS_NONE)
vid.setVideoPath("android.resource://me.kavishdevar.librepods/" + R.raw.connected)
vid.setOnErrorListener { _, what, extra ->
Log.e("PopupWindow", "Error playing popup video: what=$what extra=$extra")
true
}
vid.setVideoPath("android.resource://${context.packageName}/${R.raw.connected}")
vid.resolveAdjustedSize(vid.width, vid.height)
vid.start()
vid.setOnCompletionListener {
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/me/kavishdevar/librepods/utils/KotlinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class KotlinModule: XposedModule() {
}

val uri = iconUri.toUri()
if (!uri.toString().startsWith("android.resource://me.kavishdevar.librepods")) {
if (uri.authority != moduleApplicationInfo.packageName) {
return@intercept chain.proceed()
}

Expand Down