From 479bfc41030bf876528a53ec9a5124b224ae86a0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 1 Feb 2022 21:55:55 +0100
Subject: [PATCH] NSClient: enable sync controls without engineering mode #2

---
 .../general/nsclient/NSClientAddUpdateWorker.kt        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
index 8ddd44b31a..78f69cf5de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
@@ -75,7 +75,7 @@ class NSClientAddUpdateWorker(
                 if (mills > latestDateInReceivedData) latestDateInReceivedData = mills
 
             if (insulin > 0) {
-                if (sp.getBoolean(R.string.key_ns_receive_insulin, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                if (sp.getBoolean(R.string.key_ns_receive_insulin, false) || config.NSCLIENT) {
                     bolusFromJson(json)?.let { bolus ->
                         repository.runTransactionForResult(SyncNsBolusTransaction(bolus))
                             .doOnError {
@@ -109,7 +109,7 @@ class NSClientAddUpdateWorker(
                 }
             }
             if (carbs > 0) {
-                if (sp.getBoolean(R.string.key_ns_receive_carbs, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                if (sp.getBoolean(R.string.key_ns_receive_carbs, false) || config.NSCLIENT) {
                     carbsFromJson(json)?.let { carb ->
                         repository.runTransactionForResult(SyncNsCarbsTransaction(carb))
                             .doOnError {
@@ -159,7 +159,7 @@ class NSClientAddUpdateWorker(
             when {
                 insulin > 0 || carbs > 0                                    -> Any()
                 eventType == TherapyEvent.Type.TEMPORARY_TARGET.text        ->
-                    if (sp.getBoolean(R.string.key_ns_receive_temp_target, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                    if (sp.getBoolean(R.string.key_ns_receive_temp_target, false) || config.NSCLIENT) {
                         temporaryTargetFromJson(json)?.let { temporaryTarget ->
                             repository.runTransactionForResult(SyncNsTemporaryTargetTransaction(temporaryTarget))
                                 .doOnError {
@@ -205,7 +205,7 @@ class NSClientAddUpdateWorker(
                         } ?: aapsLogger.error("Error parsing TT json $json")
                     }
                 eventType == TherapyEvent.Type.NOTE.text  && json.isEffectiveProfileSwitch()        -> // replace this by new Type when available in NS
-                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
                         effectiveProfileSwitchFromJson(json, dateUtil)?.let { effectiveProfileSwitch ->
                             repository.runTransactionForResult(SyncNsEffectiveProfileSwitchTransaction(effectiveProfileSwitch))
                                 .doOnError {
@@ -399,7 +399,7 @@ class NSClientAddUpdateWorker(
                         } ?: aapsLogger.error("Error parsing TemporaryBasal json $json")
                     }
                 eventType == TherapyEvent.Type.PROFILE_SWITCH.text          ->
-                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) || config.NSCLIENT) {
                         profileSwitchFromJson(json, dateUtil, activePlugin)?.let { profileSwitch ->
                             repository.runTransactionForResult(SyncNsProfileSwitchTransaction(profileSwitch))
                                 .doOnError {