mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix ISE when utilizing the ear piece for voice notes.

fork-5.53.8
Alex Hart 2022-08-29 10:09:28 -03:00
rodzic 6ebc453e4b
commit 2743492076
2 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackController.kt
Wyświetl plik

@ -41,7 +41,7 @@ class VoiceNotePlaybackController(
} }
player.playWhenReady = false player.playWhenReady = false
player.setAudioAttributes(attributes, true) player.setAudioAttributes(attributes, newStreamType == AudioManager.STREAM_MUSIC)
if (newStreamType == AudioManager.STREAM_VOICE_CALL) { if (newStreamType == AudioManager.STREAM_VOICE_CALL) {
player.playWhenReady = true player.playWhenReady = true

9
app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt
Wyświetl plik

@ -15,6 +15,7 @@ import org.mockito.Mockito.anyBoolean
import org.mockito.Mockito.mock import org.mockito.Mockito.mock
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` import org.mockito.Mockito.`when`
import org.mockito.kotlin.eq
import org.robolectric.RobolectricTestRunner import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config import org.robolectric.annotation.Config
@ -24,8 +25,8 @@ class VoiceNotePlaybackControllerTest {
private val mediaSessionCompat = mock(MediaSessionCompat::class.java) private val mediaSessionCompat = mock(MediaSessionCompat::class.java)
private val playbackParameters = VoiceNotePlaybackParameters(mediaSessionCompat) private val playbackParameters = VoiceNotePlaybackParameters(mediaSessionCompat)
private val mediaAudioAttributes = AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MUSIC).setUsage(C.USAGE_MEDIA).build() private val mediaAudioAttributes = AudioAttributes.Builder().setContentType(C.AUDIO_CONTENT_TYPE_MUSIC).setUsage(C.USAGE_MEDIA).build()
private val callAudioAttributes = AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_SPEECH).setUsage(C.USAGE_VOICE_COMMUNICATION).build() private val callAudioAttributes = AudioAttributes.Builder().setContentType(C.AUDIO_CONTENT_TYPE_SPEECH).setUsage(C.USAGE_VOICE_COMMUNICATION).build()
private val player: SimpleExoPlayer = mock(SimpleExoPlayer::class.java) private val player: SimpleExoPlayer = mock(SimpleExoPlayer::class.java)
private val testSubject = VoiceNotePlaybackController(player, playbackParameters) private val testSubject = VoiceNotePlaybackController(player, playbackParameters)
@ -43,7 +44,7 @@ class VoiceNotePlaybackControllerTest {
// THEN // THEN
verify(player).playWhenReady = false verify(player).playWhenReady = false
verify(player).setAudioAttributes(expected, true) verify(player).setAudioAttributes(expected, false)
verify(player).playWhenReady = true verify(player).playWhenReady = true
} }
@ -78,7 +79,7 @@ class VoiceNotePlaybackControllerTest {
// THEN // THEN
verify(player, Mockito.never()).playWhenReady = anyBoolean() verify(player, Mockito.never()).playWhenReady = anyBoolean()
verify(player, Mockito.never()).setAudioAttributes(any(), anyBoolean()) verify(player, Mockito.never()).setAudioAttributes(any(), eq(false))
} }
@Test @Test