empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Disable voice note proximity sensor when using bluetooth headset. (#2448)"

Browse source 
This reverts commit 9c7a5e3cc8.
This commit is contained in:
Cody Henthorne 2022-06-28 17:10:33 -04:00
parent ba6e1b5dd5
commit 1129ca28fb
4 changed files with 1 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -434,8 +434,6 @@ dependencies {
implementation libs.conscrypt.android
implementation libs.signal.aesgcmprovider
implementation libs.audioswitch
implementation project(':libsignal-service')
implementation project(':paging')
implementation project(':core-util')

27
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt
View file

@ -14,8 +14,6 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import com.twilio.audioswitch.AudioDevice
import com.twilio.audioswitch.AudioSwitch
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.util.ServiceUtil
import java.util.concurrent.TimeUnit
@ -42,7 +40,6 @@ class VoiceNoteProximityWakeLockManager(
private val mediaControllerCallback = MediaControllerCallback()
private val hardwareSensorEventListener = HardwareSensorEventListener()
private val audioSwitch: AudioSwitch? = if (Build.VERSION.SDK_INT < 31) AudioSwitch(activity.applicationContext) else null
private var startTime: Long = -1
@ -53,25 +50,12 @@ class VoiceNoteProximityWakeLockManager(
}
override fun onResume(owner: LifecycleOwner) {
if (audioSwitch == null) {
startListening()
} else {
audioSwitch.start { _, selectedAudioDevice -> onFocusedAudioDeviceChanged(selectedAudioDevice) }
}
}
override fun onPause(owner: LifecycleOwner) {
audioSwitch?.stop()
stopListening()
}
private fun startListening() {
if (proximitySensor != null) {
mediaController.registerCallback(mediaControllerCallback)
}
}
private fun stopListening() {
override fun onPause(owner: LifecycleOwner) {
if (proximitySensor != null) {
unregisterCallbacksAndRelease()
}
@ -84,19 +68,10 @@ class VoiceNoteProximityWakeLockManager(
fun unregisterFromLifecycle() {
if (proximitySensor != null) {
stopListening()
activity.lifecycle.removeObserver(this)
}
}
private fun onFocusedAudioDeviceChanged(audioDevice: AudioDevice?) {
if (audioDevice is AudioDevice.BluetoothHeadset) {
stopListening()
} else {
startListening()
}
}
private fun isActivityResumed() = activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)
private fun isPlayerActive() = mediaController.playbackState.state == PlaybackStateCompat.STATE_BUFFERING ||

1
dependencies.gradle
View file

@ -113,7 +113,6 @@ dependencyResolutionManagement {
alias('lottie').to('com.airbnb.android:lottie:3.6.0')
alias('stickyheadergrid').to('com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4')
alias('dnsjava').to('dnsjava:dnsjava:2.1.9')
alias('audioswitch').to('com.twilio:audioswitch:1.1.4')
// Mp4Parser
alias('mp4parser-isoparser').to('org.mp4parser', 'isoparser').versionRef('mp4parser')

16
gradle/verification-metadata.xml
View file

@ -73,14 +73,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="2efcab81ef91b211bacd206eaacd995a51f633a2e96b57a8fc00144c5f9c56b3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation" version="1.3.0">
<artifact name="annotation-1.3.0.jar">
<sha256 value="97dc45afefe3a1e421da42b8b6e9f90491477c45fc6178203e3a5e8a05ee8553" origin="Generated by Gradle"/>
</artifact>
<artifact name="annotation-1.3.0.module">
<sha256 value="9516c2ae44284ea0bd3d0eade0ee638879b708cbe31e3af92ba96c300604ebc3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation-experimental" version="1.0.0">
<artifact name="annotation-experimental-1.0.0.aar">
<sha256 value="b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11" origin="Generated by Gradle"/>
@ -3243,14 +3235,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="33c9b0c584f2e7a72c4e4ea433fc05026d4a36b82e57ed1c877d1f9508bdbc50" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.twilio" name="audioswitch" version="1.1.4">
<artifact name="audioswitch-1.1.4.aar">
<sha256 value="881dd2836afa59a2dbb2ee3a847e3675e9c9f013cb5c79d872d90ea28598077c" origin="Generated by Gradle"/>
</artifact>
<artifact name="audioswitch-1.1.4.pom">
<sha256 value="0c2e049ba0856435164e1c46ef6284409848c41c8f483c08ecc611d338cf614c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.uber.rxdogtag2" name="rxdogtag" version="2.0.1">
<artifact name="rxdogtag-2.0.1.jar">
<sha256 value="0e09c60f88d446ff209c17a0a36503b49fdec475225d4381ae4fe9ed83fb912d" origin="Generated by Gradle"/>