Skip to content

Refactor: VolumeKeyControlModuleHandlers #110

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

Merged
Hepolise merged 1 commit into from
Apr 21, 2025
Merged

Refactor: VolumeKeyControlModuleHandlers #110

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
11 changes: 6 additions & 5 deletions app/src/main/java/ru/hepolise/volumekeytrackcontrol/module/VolumeKeyControlModuleHandlers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ object VolumeKeyControlModuleHandlers {
handleVolumeSkipPressAbort(param.thisObject)
} else {
// only one button pressed
if (getMediaController()?.isMusicActive() == true) {
if (getMediaController().isMusicActive()) {
log("music is active, creating delayed skip")
handleVolumeSkipPress(param.thisObject, isDown)
}
Expand All @@ -197,7 +197,7 @@ object VolumeKeyControlModuleHandlers {
}
log("up action received, down: $isDownPressed, up: $isUpPressed")
handleVolumeAllPressAbort(param.thisObject)
if (!isLongPress && getMediaController()?.isMusicActive() == true) {
if (!isLongPress && getMediaController().isMusicActive()) {
log("adjusting music volume")
val direction = when (keyCode) {
KeyEvent.KEYCODE_VOLUME_UP -> AudioManager.ADJUST_RAISE
Expand All @@ -223,9 +223,10 @@ object VolumeKeyControlModuleHandlers {
}

private fun getMediaController(): MediaController? {
val prefs = SharedPreferencesUtil.prefs()
return mediaControllers?.find {
val filterType = SharedPreferencesUtil.prefs().getAppFilterType()
val apps = SharedPreferencesUtil.prefs().getApps(filterType)
val filterType = prefs.getAppFilterType()
val apps = prefs.getApps(filterType)
when (filterType) {
SharedPreferencesUtil.AppFilterType.Disabled -> true
SharedPreferencesUtil.AppFilterType.WhiteList -> it.packageName in apps
Expand All @@ -234,7 +235,7 @@ object VolumeKeyControlModuleHandlers {
}?.also { log("chosen media controller: ${it.packageName}") }
}

private fun MediaController.isMusicActive() = when (playbackState?.state) {
private fun MediaController?.isMusicActive() = when (this?.playbackState?.state) {
PlaybackState.STATE_PLAYING,
PlaybackState.STATE_FAST_FORWARDING,
PlaybackState.STATE_REWINDING,
Expand Down