Revert audio focus duck attempt (#423) — restore audio output for #421

[9thLevelSoftware]

Summary

Reverts PR #423 (6371274) — the "request transient duck audio focus" attempt at fixing #421.

After #423 shipped, #421 was retested and reopened with a worse symptom: the in-app Test Sounds button produces haptic feedback but no audio at all across multiple different sound files (chirpchirp, beepboop, rep_05, boopbeepbeep). Owner's diagnosis on the issue: "refactoring broke something with the audio prioritization."

Diagnostic findings that motivated the revert

• res/raw/ audit: all 66 .ogg files exist; every name referenced in HapticFeedbackEffect.android.kt resolves. Not a missing-resource bug.
• Test Sounds dispatch: MainViewModel.testSounds() emits 4 events through the same global HapticFeedbackEffect hosted in EnhancedMainScreen. Three of four have haptics; haptics fire, audio doesn't. Failure is downstream of dispatch — in the SoundPool/MediaPlayer/AudioFocus stack.
• Most recent change to that stack is Request transient duck audio focus for Android workout cues #423, which wraps every SoundPool.play and playWithMediaPlayer call in a transient-duck audio focus request and ties focus-hold duration to a freshly-measured cue duration. It is also the most invasive (+163/-22).

What this PR keeps

• PR [Bug]: No Sounds in 0.9.0 #409 (ec0f673) — volumeControlStream = STREAM_MUSIC in MainActivity, warnIfMediaVolumeMuted diagnostic, loadedSounds async-load gate, improved error logging. All independently useful.
• v0.9.0 sweep audio-mapping changes — FINAL_REP, chirpchirp for REP_COMPLETED, VELOCITY_THRESHOLD_REACHED, HapticEventAudioTest.

What this PR removes

• requestTransientDuckAudioFocus helper + AudioFocusSession interface
• focusHoldDurationMs / getSoundDurationMs / soundDurationCacheMs
• abandonAfterDelay / useDurationOrZero
• Audio-focus request/abandon calls inside playSound and playWithMediaPlayer

Single file changed: shared/src/androidMain/.../HapticFeedbackEffect.android.kt (-163/+22).

Expected effect

• The "haptic fires, audio is silent" regression observed on Pixel 9 XL / Android 16 should disappear.
• The original [Bug]: Audio cues (reps, pr's) not taking precedence over music #421 symptom — cues do not duck Spotify — will return. That is intentional: this restores a known-working baseline so a different approach to ducking can be designed without compounding the regression.

Test plan

• Tap Settings → Test Sounds with no music playing. Expect: haptics + 4 audible cues (chirpchirp, beepboop, rep_05, boopbeepbeep).
• Start any routine and complete reps. Expect: rep beeps audible.
• Repeat with Spotify playing. Expect: cues play over music (original [Bug]: Audio cues (reps, pr's) not taking precedence over music #421 behavior — not yet fixed; tracked separately).
• Verify hardware volume buttons still control media stream (PR [Bug]: No Sounds in 0.9.0 #409 change retained).
• ./gradlew :androidApp:assembleDebug builds clean.
• ./gradlew :shared:testDebugUnitTest — HapticEventAudioTest should still pass (only Android playback path was touched).

Closes/relates: #421 (regression rollback, not full fix).

---

Generated by Claude Code

---

Perform an AI-assisted review on

[gemini-code-assist]

Code Review

This pull request simplifies the Android haptic feedback implementation by removing unnecessary audio focus management logic. The review identified a potential resource leak in the MediaPlayer initialization and suggested refactoring the inlined sound name lists into constants to improve code efficiency and maintainability.

[gemini-code-assist]

The MediaPlayer instance created via MediaPlayer.create is not released if an exception occurs during setVolume, setOnCompletionListener, or start. Since mediaPlayer is declared inside the try block, it is not accessible in the catch block, leading to a potential resource leak of native audio resources. Declaring the variable outside the try block allows for proper cleanup in the catch block.

    var mediaPlayer: MediaPlayer? = null
    try {
        val audioAttributes = AudioAttributes.Builder()
            .setUsage(
                if (DeviceInfo.isFireOS()) {
                    AudioAttributes.USAGE_MEDIA
                } else {
                    AudioAttributes.USAGE_GAME
                },
            )
            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
            .build()

        mediaPlayer = MediaPlayer.create(context, resId, audioAttributes, 0) ?: return
        mediaPlayer.setVolume(1.0f, 1.0f)
        mediaPlayer.setOnCompletionListener { it.release() }
        mediaPlayer.start()
    } catch (_: Exception) {
        mediaPlayer?.release()
    }

[gemini-code-assist]

Inlining the lists of sound names in getRandomBadgeSound and getRandomPRSound introduces duplication (as these lists are also defined in the remember block at line 90) and results in unnecessary object allocations on every function call. Moving these to private constants improves maintainability and efficiency. Note that the remember block at line 90 should also be updated to reference these constants.

private val BADGE_SOUND_NAMES = listOf(
    "absolute_domination", "absolute_unit", "another_milestone_crushed",
    "beast_mode", "insane_performance", "maxed_out", "new_peak_achieved",
    "new_record_secured", "no_ones_stopping_you_now", "power", "pr",
    "pressure_create_greatness", "record", "shattered", "strenght_unlocked",
    "that_bar_never_stood_a_chance", "that_was_a_demolition", "that_was_god_mode",
    "that_was_monster_level", "that_was_next_tier_strenght", "that_was_pure_savagery",
    "the_grind_continues", "the_grind_is_real", "this_is_what_champions_are_made",
    "unchained_power", "unstoppable", "victory", "you_crushed_that",
    "you_dominated_that_set", "you_just_broke_your_limits", "you_just_destroyed_that_weight",
    "you_just_levelled_up", "you_went_full_throttle",
)

private val PR_SOUND_NAMES = listOf("new_personal_record", "new_personal_record_2")

/**
 * Get a random badge celebration sound name.
 */
private fun getRandomBadgeSound(): String {
    return BADGE_SOUND_NAMES[Random.nextInt(BADGE_SOUND_NAMES.size)]
}

/**
 * Get a random PR celebration sound name.
 */
private fun getRandomPRSound(): String {
    return PR_SOUND_NAMES[Random.nextInt(PR_SOUND_NAMES.size)]
}

[Copilot]

Pull request overview

Reverts the Android “transient duck audio focus” implementation introduced in #423 in order to restore reliable in-app audio cue playback (regression reported in #421), returning to the previously working SoundPool/MediaPlayer behavior while keeping earlier diagnostics and mappings.

Changes:

• Removed transient-duck audio focus request/abandon logic and associated duration-measurement/caching utilities.
• Simplified playSound and playWithMediaPlayer to play without acquiring audio focus, relying on existing SoundPool + MediaPlayer fallback behavior.
• Inlined badge/PR sound-name lists into the random-selection helpers after removing the shared helper functions.

Comments suppressed due to low confidence (1)

shared/src/androidMain/kotlin/com/devil/phoenixproject/presentation/components/HapticFeedbackEffect.android.kt:360

• prSoundNames is duplicated here and also in the prSoundIds loader above. To avoid future mismatches between the sounds loaded into SoundPool vs those selected for playback, consider extracting a shared constant/list and referencing it in both places.

        val effect = when (event) {
            is HapticEvent.REP_COMPLETED -> {
                // Light, quick click for each rep

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[9thLevelSoftware]

@copilot apply changes based on this feedback

[Copilot]

Implemented in commit 09d3b42. HapticFeedbackEffect.android.kt now uses shared BADGE_SOUND_NAMES/PR_SOUND_NAMES constants for both SoundPool loading and random selection, so the badge/PR lists are no longer duplicated.

[Copilot]

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

• dl.google.com
  • Triggering command: /usr/lib/jvm/temurin-17-jdk-amd64/bin/java /usr/lib/jvm/temurin-17-jdk-amd64/bin/java --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.xml/javax.xml.namespace=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED -XX:+UseParallelGC -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=512m -Xmx8g -Dfile.encoding=UTF-8 -Duser.country -Duser.language=en (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

• Configure Actions setup steps to set up my environment, which run before the firewall is enabled
• Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

[kilo-code-bot]

Code Review Summary

Status: 2 Issues Found | Recommendation: Address before merge

Overview

Severity	Count
WARNING	2

Issue Details (click to expand)

WARNING

File	Line	Issue
shared/src/androidMain/kotlin/com/devil/phoenixproject/presentation/components/HapticFeedbackEffect.android.kt	328	Typo in sound name "strenght_unlocked" — should be "strength_unlocked"
shared/src/androidMain/kotlin/com/devil/phoenixproject/presentation/components/HapticFeedbackEffect.android.kt	330	Typo in sound name "that_was_next_tier_strenght" — should be "that_was_next_tier_strength"

Other Observations (not in diff)

Issues found in unchanged code that cannot receive inline comments:

The typos at lines 328 and 330 were pre-existing in getBadgeSoundNames() and have been carried forward to the new BADGE_SOUND_NAMES constant. These typos would cause sound resources to not be found (silent failures) if the actual sound files are named with correct spelling.

Files Reviewed (1 files)

• shared/src/androidMain/kotlin/com/devil/phoenixproject/presentation/components/HapticFeedbackEffect.android.kt - 2 issues (typo issues carried forward from pre-existing code)

---

_{Reviewed by laguna-m.1-20260312:free · 1,967,425 tokens}