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

Fix lifecycle of VoiceNoteProximityWakeLockManager.

Browse source
This commit is contained in:
Alex Hart 2021-11-01 11:56:00 -03:00 • committed by Greyson Parrelli
parent 314ea98393
commit e02c8b9db7
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
View file

@ -124,6 +124,12 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
@Override
public void onDestroy(@NonNull LifecycleOwner owner) {
if (voiceNoteProximityWakeLockManager != null) {
voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease();
voiceNoteProximityWakeLockManager.unregisterFromLifecycle();
voiceNoteProximityWakeLockManager = null;
}
activity.getLifecycle().removeObserver(this);
activity = null;
}
@ -294,6 +300,7 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
if (voiceNoteProximityWakeLockManager != null) {
Log.d(TAG, "Session reconnected, cleaning up old wake lock manager");
voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease();
voiceNoteProximityWakeLockManager.unregisterFromLifecycle();
voiceNoteProximityWakeLockManager = null;
}
}

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

@ -66,6 +66,12 @@ class VoiceNoteProximityWakeLockManager(
cleanUpWakeLock()
}
fun unregisterFromLifecycle() {
if (proximitySensor != null) {
activity.lifecycle.removeObserver(this)
}
}
private fun isActivityResumed() = activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)
private fun isPlayerActive() = mediaController.playbackState.state == PlaybackStateCompat.STATE_BUFFERING ||