caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix Automation rule

Browse source 
Action not displayed with JSONArray, it works with a JSONObject...
This commit is contained in:
Philoul 2021-09-12 15:56:34 +02:00
parent f505e23d50
commit c49dbe655a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
View file

@ -6,7 +6,6 @@ import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.Callback
import org.json.JSONArray
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject
@ -48,7 +47,7 @@ abstract class Action(val injector: HasAndroidInjector) {
fun instantiate(obj: JSONObject): Action? { fun instantiate(obj: JSONObject): Action? {
try { try {
val type = obj.getString("type") val type = obj.getString("type")
val data = if (obj.has("data")) obj.getJSONArray("data") else JSONArray() val data = if (obj.has("data")) obj.getJSONObject("data") else JSONObject()
return when (type) { return when (type) {
ActionAlarm::class.java.name, // backward compatibility ActionAlarm::class.java.name, // backward compatibility
ActionAlarm::class.java.simpleName -> ActionAlarm(injector).fromJSON(data.toString()) ActionAlarm::class.java.simpleName -> ActionAlarm(injector).fromJSON(data.toString())