From bd05484b2d0b5619268f2a141be51c62163bfb31 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 1 Sep 2020 10:58:45 +0300
Subject: [PATCH] Initialize fields in the constructor.
---
.../app/features/call/CallProximityManager.kt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt b/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
index 4da1c3fa45..357fe8d41e 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
@@ -39,14 +39,16 @@ class CallProximityManager @Inject constructor(val context: Context) : SensorEve
private var wakeLock: PowerManager.WakeLock? = null
private var sensor: Sensor? = null
+ init {
+ powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+ sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+ sensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY)
+ }
+
/**
* Start listening the proximity sensor. [stop] function should be called to release the sensor and the WakeLock.
*/
fun start() {
- powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
- sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
- sensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY)
-
if (sensor != null && powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL)
}
@@ -56,9 +58,7 @@ class CallProximityManager @Inject constructor(val context: Context) : SensorEve
* Stop listening proximity sensor changes and release the WakeLock.
*/
fun stop() {
- if (this::sensorManager.isInitialized) {
- sensorManager.unregisterListener(this)
- }
+ sensorManager.unregisterListener(this)
wakeLock?.release()
}