Cleanup

Author: remcoder

app/src/main/java/com/q42/milightremotecontrol/MainActivity.kt

@@ -28,32 +28,13 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         setContentView(R.layout.activity_main)
 
         controller = MiLightController(this@MainActivity)
-//        controller.discover()
+
         launch(Dispatchers.IO) {
-            val ip = try {
-                InetAddress.getByName(bridge)
-            } catch (ex: UnknownHostException) {
-                withContext(Dispatchers.Main) {
-                    toast("Error while looking for bridge:\n${ex.message}")
-                }
-                null
-            }
-            ip?.let {
-                Log.i(TAG, "$ip")
-                controller.bridgeAddress = ip
-            }
+            discoverBridge()
         }
 
         discover.setOnClickListener {
-            launch(Dispatchers.IO) {
-
-                val bridgeAddress = async { controller.discover() }
-
-                withContext(Dispatchers.Main) {
-
-                    bridge_id.text = bridgeAddress.await().toString()
-                }
-            }
+            discoverBridge()
         }
 
         on_button.setOnClickListener {
@@ -102,6 +83,18 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
     }
 
+    fun discoverBridge() {
+        launch(Dispatchers.IO) {
+
+            val bridgeAddress = async { controller.discover() }
+
+            withContext(Dispatchers.Main) {
+
+                bridge_id.text = bridgeAddress.await().toString()
+            }
+        }
+    }
+
 
     override fun onDestroy() {
         super.onDestroy()

app/src/main/java/com/q42/milightremotecontrol/MiLightController.kt

@@ -48,17 +48,18 @@ class MiLightController(
         socket.receive(receivePacket)
         val session1 = UByte.fromByte(receivePacket.data[19]).toInt()
         val session2 = UByte.fromByte(receivePacket.data[20]).toInt()
-        Log.i(TAG, "session id: $session1 $session2")
+        Log.d(TAG, "session id: $session1 $session2")
         return Session(socket, session1, session2)
     }
 
     private fun sendCommand(cmd: ByteArray) {
 
         if (bridgeAddress == null) {
-            Log.i(TAG, "NO BRIDGE")
+            Log.w(TAG, "NO BRIDGE")
             return
         }
 
+        Log.d(TAG, "Request session")
         launch(Dispatchers.IO) {
             try {
                 // request session
@@ -122,8 +123,6 @@ class MiLightController(
             withContext(Dispatchers.Main) {
                 Log.i(TAG, ("received ${response.length} bytes from ${response.address}: $data"))
             }
-
-            socket.close()
         }
 
         bridgeAddress = response.address