From 78f1fe096a514f75ef9f0a1b42e2f29a5cb46c2c Mon Sep 17 00:00:00 2001
From: Jakub Kuczys <me@jacken.men>
Date: Wed, 6 Dec 2023 15:51:55 +0100
Subject: [PATCH] Remove xdrip prefs file

---
 core/utils/src/main/res/values/keys.xml       |  1 -
 .../aaps/plugins/source/XdripSourcePlugin.kt  |  4 ++--
 .../source/src/main/res/values/strings.xml    |  5 ++--
 .../source/src/main/res/xml/pref_dexcom.xml   |  4 ++--
 .../source/src/main/res/xml/pref_xdrip.xml    | 23 -------------------
 .../plugins/source/XdripSourcePluginTest.kt   |  2 +-
 6 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 plugins/source/src/main/res/xml/pref_xdrip.xml

diff --git a/core/utils/src/main/res/values/keys.xml b/core/utils/src/main/res/values/keys.xml
index 1dc4a7f260..8493fae85b 100644
--- a/core/utils/src/main/res/values/keys.xml
+++ b/core/utils/src/main/res/values/keys.xml
@@ -50,7 +50,6 @@
     <string name="key_insight_local_settings" translatable="false">insight_local_settings</string>
     <string name="key_data_choices_settings" translatable="false">data_choices_settings</string>
     <string name="key_dexcom_settings" translatable="false">dexcom_settings</string>
-    <string name="key_xdrip_settings" translatable="false">xdrip_settings</string>
     <string name="key_active_pump_change_timestamp" translatable="false">active_pump_change_timestamp</string>
     <string name="key_active_pump_type" translatable="false">active_pump_type</string>
     <string name="key_active_pump_serial_number" translatable="false">active_pump_serial_number</string>
diff --git a/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt
index dcb91782f7..0ee8e1d7e8 100644
--- a/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt
+++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/XdripSourcePlugin.kt
@@ -43,7 +43,7 @@ class XdripSourcePlugin @Inject constructor(
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
         .pluginIcon((app.aaps.core.main.R.drawable.ic_blooddrop_48))
-        .preferencesId(R.xml.pref_xdrip)
+        .preferencesId(R.xml.pref_dexcom)
         .pluginName(R.string.source_xdrip)
         .description(R.string.description_source_xdrip),
     aapsLogger, rh, injector
@@ -80,7 +80,7 @@ class XdripSourcePlugin @Inject constructor(
 
         fun getSensorStartTime(bundle: Bundle): Long? {
             val now = dateUtil.now()
-            var sensorStartTime: Long? = if (sp.getBoolean(R.string.key_xdrip_log_ns_sensor_change, false)) {
+            var sensorStartTime: Long? = if (sp.getBoolean(R.string.key_dexcom_log_ns_sensor_change, false)) {
                 bundle.getLong(Intents.EXTRA_SENSOR_STARTED_AT, 0)
             } else {
                 null
diff --git a/plugins/source/src/main/res/values/strings.xml b/plugins/source/src/main/res/values/strings.xml
index d2a3aa7d08..9c2db02d03 100644
--- a/plugins/source/src/main/res/values/strings.xml
+++ b/plugins/source/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <!-- Source -->
     <string name="key_dexcom_log_ns_sensor_change" translatable="false">dexcom_lognssensorchange</string>
-    <string name="key_xdrip_log_ns_sensor_change" translatable="false">xdrip_lognssensorchange</string>
     <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
     <string name="key_last_processed_intelligo_timestamp" translatable="false">last_processed_intelligo_timestamp</string>
 
@@ -40,8 +39,8 @@
     <string name="do_xdrip_upload_title">Send BG data to xDrip+</string>
     <string name="do_xdrip_upload_summary">In xDrip+ select 640g/Eversense data source</string>
     <string name="bgsource_upload">BG upload settings</string>
-    <string name="log_ns_sensor_change_title">Log sensor change to NS</string>
-    <string name="log_ns_sensor_change_summary">Create event \"Sensor Change\" in NS automatically on sensor start</string>
+    <string name="dexcom_log_ns_sensor_change_title">Log sensor change to NS</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Create event \"Sensor Change\" in NS automatically on sensor start</string>
     <string name="direction">direction</string>
 
 
diff --git a/plugins/source/src/main/res/xml/pref_dexcom.xml b/plugins/source/src/main/res/xml/pref_dexcom.xml
index 2479f27cd6..f9891d0049 100644
--- a/plugins/source/src/main/res/xml/pref_dexcom.xml
+++ b/plugins/source/src/main/res/xml/pref_dexcom.xml
@@ -15,8 +15,8 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_dexcom_log_ns_sensor_change"
-            android:summary="@string/log_ns_sensor_change_summary"
-            android:title="@string/log_ns_sensor_change_title" />
+            android:summary="@string/dexcom_log_ns_sensor_change_summary"
+            android:title="@string/dexcom_log_ns_sensor_change_title" />
 
     </PreferenceCategory>
 
diff --git a/plugins/source/src/main/res/xml/pref_xdrip.xml b/plugins/source/src/main/res/xml/pref_xdrip.xml
deleted file mode 100644
index 1eb5069016..0000000000
--- a/plugins/source/src/main/res/xml/pref_xdrip.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory
-        android:key="@string/key_xdrip_settings"
-        android:title="@string/bgsource_upload"
-        app:initialExpandedChildrenCount="0">
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_do_ns_upload"
-            android:title="@string/do_ns_upload_title" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_xdrip_log_ns_sensor_change"
-            android:summary="@string/log_ns_sensor_change_summary"
-            android:title="@string/log_ns_sensor_change_title" />
-
-    </PreferenceCategory>
-
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt b/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt
index 360a837549..6afe6d546a 100644
--- a/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt
+++ b/plugins/source/src/test/kotlin/app/aaps/plugins/source/XdripSourcePluginTest.kt
@@ -59,7 +59,7 @@ class XdripSourcePluginTest : TestBase() {
     ): Pair<Bundle, XdripSourcePlugin.XdripSourceWorker> {
         val bundle = BundleMock.mock()
         sensorStartTime?.let { bundle.putLong(Intents.EXTRA_SENSOR_STARTED_AT, sensorStartTime) }
-        `when`(sp.getBoolean(R.string.key_xdrip_log_ns_sensor_change, false)).thenReturn(logNsSensorChange)
+        `when`(sp.getBoolean(R.string.key_dexcom_log_ns_sensor_change, false)).thenReturn(logNsSensorChange)
 
         lateinit var worker: XdripSourcePlugin.XdripSourceWorker
         TestListenableWorkerBuilder<XdripSourcePlugin.XdripSourceWorker>(context)