From 81d500477f0f883b753c7a6de9ea3456296f2c31 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sun, 21 Nov 2021 00:14:23 +0100 Subject: [PATCH] Add missing string and Fix Crash --- core/src/main/res/values/strings.xml | 2 +- .../info/nightscout/androidaps/danar/AbstractDanaRPlugin.java | 3 +-- .../androidaps/plugins/pump/insight/LocalInsightFragment.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 8b517b63b4..209944b186 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -519,7 +519,7 @@ User request Bolus OK Pump paired - Insight Refresh Button + Insight Refresh Button READSTATUS %1$s diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java index 898299d258..d3b36b4634 100644 --- a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java +++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java @@ -62,7 +62,6 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump protected DateUtil dateUtil; protected AapsSchedulers aapsSchedulers; protected PumpSync pumpSync; - protected ResourceHelper rh; protected AbstractDanaRPlugin( HasAndroidInjector injector, @@ -112,7 +111,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump if (event.isChanged(getRh(), R.string.key_danar_bt_name)) { danaPump.reset(); pumpSync.connectNewPump(); - getCommandQueue().readStatus(rh.gs(R.string.device_changed), null); + getCommandQueue().readStatus(getRh().gs(R.string.device_changed), null); } }) ); diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java index 56653c2216..e4009bea7e 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java @@ -149,7 +149,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick }); } }; - commandQueue.readStatus("InsightRefreshButton", refreshCallback); + commandQueue.readStatus(rh.gs(R.string.insight_refresh_button), refreshCallback); } }