From 1129ca28fb61097a14741e6aef551884478ce804 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 28 Jun 2022 17:10:33 -0400 Subject: [PATCH] Revert "Disable voice note proximity sensor when using bluetooth headset. (#2448)" This reverts commit 9c7a5e3cc816427d3f2e9a8b5066f25667c50a8a. --- app/build.gradle | 2 -- .../VoiceNoteProximityWakeLockManager.kt | 27 +------------------ dependencies.gradle | 1 - gradle/verification-metadata.xml | 16 ----------- 4 files changed, 1 insertion(+), 45 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 530476f3e6..ff97000960 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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') diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt index 5da0d8821a..499dea8a2b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt @@ -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 || diff --git a/dependencies.gradle b/dependencies.gradle index 54a03bcdbb..120c363af0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ec09a068af..cbccfd9014 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -73,14 +73,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -3243,14 +3235,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - -