mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore reading service data for configured button widgets (#3514)

Browse source
This commit is contained in:
Joris Pelgröm 2023-05-13 04:45:26 +02:00 committed by GitHub
parent 7e1dc203ec
commit 57024e1561
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt
View file

@ -27,6 +27,7 @@ import androidx.core.graphics.toColorInt
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.google.android.material.color.DynamicColors
import com.maltaisn.icondialog.IconDialog
import com.maltaisn.icondialog.IconDialogSettings
@ -134,8 +135,24 @@ class ButtonWidgetConfigureActivity : BaseWidgetConfigureActivity(), IconDialog.
val fieldKeys = fields.keys
Log.d(TAG, "Fields applicable to this service: $fields")
if (target !== false) {
dynamicFields.add(0, ServiceFieldBinder(serviceText, "entity_id"))
val existingServiceData = mutableMapOf<String, Any?>()
buttonWidgetDao.get(appWidgetId)?.let { buttonWidget ->
if (
buttonWidget.serverId != selectedServerId ||
"${buttonWidget.domain}.${buttonWidget.service}" != serviceText
) {
return@let
}
val dbMap: HashMap<String, Any?> = jacksonObjectMapper().readValue(buttonWidget.serviceData)
for (item in dbMap) {
val value = item.value.toString().replace("[", "").replace("]", "") + if (item.key == "entity_id") ", " else ""
existingServiceData[item.key] = value.ifEmpty { null }
}
}
if (target != false) {
dynamicFields.add(0, ServiceFieldBinder(serviceText, "entity_id", existingServiceData["entity_id"]))
}
fieldKeys.sorted().forEach { fieldKey ->
@ -145,9 +162,9 @@ class ButtonWidgetConfigureActivity : BaseWidgetConfigureActivity(), IconDialog.
// IDs get priority and go at the top, since the other fields
// are usually optional but the ID is required
if (fieldKey.contains("_id")) {
dynamicFields.add(0, ServiceFieldBinder(serviceText, fieldKey))
dynamicFields.add(0, ServiceFieldBinder(serviceText, fieldKey, existingServiceData[fieldKey]))
} else {
dynamicFields.add(ServiceFieldBinder(serviceText, fieldKey))
dynamicFields.add(ServiceFieldBinder(serviceText, fieldKey, existingServiceData[fieldKey]))
}
}