patch: fix wrong overrides being called

OpenSrcerer · Mar 23, 2024 · 042e241 · 042e241
1 parent 6d3bece
commit 042e241
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/kotlin/online/danielstefani/paddy/daemon/DaemonService.kt b/src/main/kotlin/online/danielstefani/paddy/daemon/DaemonService.kt
@@ -56,7 +56,7 @@ class DaemonService(
  schedules.map { mqtt.publish(it.id!!.toString()) }
  .let { Flowable.concat(it) }
  // Also turn the device off
- .concatWith(mqtt.publish(daemonId, "off", qos = MqttQos.EXACTLY_ONCE))
+ .concatWith(mqtt.publish(daemonId, action = "off", qos = MqttQos.EXACTLY_ONCE))
  .subscribe()
 
  // Delete the daemon itself
@@ -67,7 +67,7 @@ class DaemonService(
  daemonRepository.update(daemonId)
  { it.on = !it.on } ?: return false
 
- mqtt.publish(daemonId, "toggle", qos = MqttQos.EXACTLY_ONCE)
+ mqtt.publish(daemonId, action = "toggle", qos = MqttQos.EXACTLY_ONCE)
  ?.subscribe()
 
  return true

diff --git a/src/main/kotlin/online/danielstefani/paddy/mqtt/MqttController.kt b/src/main/kotlin/online/danielstefani/paddy/mqtt/MqttController.kt
@@ -21,7 +21,7 @@ class MqttController(
  it.lastPing = Instant.now().epochSecond
  }
 
- mqtt.publish(daemonId, if (on) "on" else "off", qos = MqttQos.EXACTLY_ONCE)
+ mqtt.publish(daemonId, action = if (on) "on" else "off", qos = MqttQos.EXACTLY_ONCE)
  ?.subscribe()
  }
 

diff --git a/src/main/kotlin/online/danielstefani/paddy/mqtt/RxMqttClient.kt b/src/main/kotlin/online/danielstefani/paddy/mqtt/RxMqttClient.kt
@@ -76,7 +76,7 @@ class RxMqttClient(
  // the application being loaded first, which can lead to publishes
  // being lost. This needs to be checked at some point.
  // So far it seems that it's not the case, but just to be sure.
- fun publish(
+ private fun publish(
  topic: String,
  message: String,
  qos: MqttQos