Merge pull request #8 from jeremyko/revert-6-feat-screen-off-on-android

Revert "feat: turn off screen on Android while listening for proximity events"

Author: jeremyko

android/src/main/kotlin/dev/jeremyko/proximity_sensor/ProximitySensorPlugin.kt

@@ -1,6 +1,7 @@
 
 package dev.jeremyko.proximity_sensor
 
+import androidx.annotation.NonNull
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.EventChannel
 
@@ -9,9 +10,10 @@ class ProximitySensorPlugin: FlutterPlugin  {
   private lateinit var channel : EventChannel
   private lateinit var streamHandler : ProximityStreamHandler
 
-  override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
     channel = EventChannel(flutterPluginBinding.binaryMessenger, "proximity_sensor")
-    streamHandler = ProximityStreamHandler( flutterPluginBinding.applicationContext)
+    streamHandler = ProximityStreamHandler( flutterPluginBinding.applicationContext,
+                                            flutterPluginBinding.binaryMessenger)
     channel.setStreamHandler(streamHandler)
   }
 

android/src/main/kotlin/dev/jeremyko/proximity_sensor/ProximityStreamHandler.kt

@@ -1,52 +1,36 @@
 package dev.jeremyko.proximity_sensor
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
-import android.os.Build
-import android.os.PowerManager
+import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.EventChannel
+import java.io.IOException
 import java.lang.UnsupportedOperationException
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 class ProximityStreamHandler(
         private val applicationContext: Context,
+        private val messenger: BinaryMessenger
 ): EventChannel.StreamHandler, SensorEventListener {
 
     private var eventSink: EventChannel.EventSink? = null
     private lateinit var sensorManager: SensorManager
     private var proximitySensor: Sensor? = null
 
-    private lateinit var powerManager: PowerManager
-    private lateinit var wakeLock: PowerManager.WakeLock
-
-    @SuppressLint("WakelockTimeout")
     override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
         eventSink = events
         sensorManager =  applicationContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager
         proximitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY) ?:
             throw UnsupportedOperationException("proximity sensor unavailable")
 
         sensorManager.registerListener(this, proximitySensor, SensorManager.SENSOR_DELAY_NORMAL)
-        powerManager = applicationContext.getSystemService(Context.POWER_SERVICE) as
-            PowerManager
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            wakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "dev.jeremyko.proximity_sensor:lock")
-            if (!wakeLock.isHeld) {
-                wakeLock.acquire()
-            }
-        }
     }
 
     override fun onCancel(arguments: Any?) {
         sensorManager.unregisterListener(this, proximitySensor)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            wakeLock.release()
-        }
     }
 
     override fun onSensorChanged(event: SensorEvent?) {