Merge branch 'dev' into dev_OAPSAIMI_V3_DBA2_70-120

app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt

@@ -21,7 +21,6 @@ import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.plugin.ActivePlugin
 import app.aaps.core.interfaces.plugin.PluginBase
 import app.aaps.core.interfaces.plugin.PluginDescription
-import app.aaps.core.interfaces.profile.ProfileUtil
 import app.aaps.core.interfaces.protection.PasswordCheck
 import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.BIOMETRIC
 import app.aaps.core.interfaces.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD
@@ -69,7 +68,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var preferences: Preferences
-    @Inject lateinit var profileUtil: ProfileUtil
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var config: Config
     @Inject lateinit var passwordCheck: PasswordCheck

gradle/libs.versions.toml

@@ -50,7 +50,7 @@ com-google-android-wearable = { group = "com.google.android.wearable", name = "w
 com-google-android-wearable-support = { group = "com.google.android.support", name = "wearable", version.ref = "wearable" }
 
 com-google-guava = { group = "com.google.guava", name = "guava", version = "33.4.0-jre" }
-com-google-code-gson = { group = "com.google.code.gson", name = "gson", version = "2.11.0" }
+com-google-code-gson = { group = "com.google.code.gson", name = "gson", version = "2.12.1" }
 com-google-crypto-tink = { group = "com.google.crypto.tink", name = "tink-android", version = "1.16.0" }
 
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -87,7 +87,7 @@ androidx-gridlayout = { group = "androidx.gridlayout", name = "gridlayout", vers
 androidx-legacy-support = { group = "androidx.legacy", name = "legacy-support-v13", version = "1.0.0" }
 androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.8.7" }
 androidx-media3-common = { group = "androidx.media3", name = "media3-common", version = "1.5.1" }
-androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version = "2.8.5" }
+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version = "2.8.6" }
 androidx-preference = { group = "androidx.preference", name = "preference-ktx", version = "1.2.1" }
 androidx-room = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
@@ -129,8 +129,8 @@ org-junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-
 
 com-madgag-spongycastle = { group = "com.madgag.spongycastle", name = "core", version = "1.58.0.0" }
 com-caverock-androidsvg = { group = "com.caverock", name = "androidsvg", version = "1.4" }
-net-danlew-android-joda = { group = "net.danlew", name = "android.joda", version = "2.13.0" }
-joda-time = { group = "joda-time", name = "joda-time", version = "2.13.0" }
+net-danlew-android-joda = { group = "net.danlew", name = "android.joda", version = "2.13.0.1" }
+joda-time = { group = "joda-time", name = "joda-time", version = "2.13.1" }
 org-json = { group = "org.json", name = "json", version = "20250107" }
 org-skyscreamer-jsonassert = { group = "org.skyscreamer", name = "jsonassert", version = "1.5.3" }
 com-scottyab-rootbeer-lib = { group = "com.scottyab", name = "rootbeer-lib", version = "0.1.1" }

plugins/source/src/main/kotlin/app/aaps/plugins/source/AbstractBgSourcePlugin.kt

@@ -24,7 +24,7 @@ abstract class AbstractBgSourcePlugin(
         parent.addPreference(category)
         category.apply {
             key = "bg_source_upload_settings"
-            title = rh.gs(R.string.bgsource_upload)
+            title = rh.gs(R.string.bgsource_settings)
             initialExpandedChildrenCount = 0
             addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.BgSourceUploadToNs, title = app.aaps.core.ui.R.string.do_ns_upload_title))
         }

plugins/source/src/main/kotlin/app/aaps/plugins/source/AbstractBgSourceWithSensorInsertLogPlugin.kt

@@ -24,10 +24,10 @@ abstract class AbstractBgSourceWithSensorInsertLogPlugin(
         parent.addPreference(category)
         category.apply {
             key = "bg_source_with_sensor_upload_settings"
-            title = rh.gs(R.string.bgsource_upload)
+            title = rh.gs(R.string.bgsource_settings)
             initialExpandedChildrenCount = 0
             addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.BgSourceUploadToNs, title = app.aaps.core.ui.R.string.do_ns_upload_title))
-            addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.BgSourceCreateSensorChange, summary = R.string.dexcom_log_ns_sensor_change_summary, title = R.string.dexcom_log_ns_sensor_change_title))
+            addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.BgSourceCreateSensorChange, summary = R.string.bgsource_log_sensor_change_summary, title = R.string.bgsource_log_sensor_change_title))
         }
     }
 }

plugins/source/src/main/res/values/strings.xml

@@ -29,9 +29,9 @@
     <string name="description_source_random_bg">Generate random BG data (Demo mode only)</string>
     <string name="random_bg_short">BG</string>
 
-    <string name="bgsource_upload">BG upload settings</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="bgsource_settings">BG source settings</string>
+    <string name="bgsource_log_sensor_change_title">Accept sensor start</string>
+    <string name="bgsource_log_sensor_change_summary">Create event \"CGM Sensor Insert\" in Careportal automatically on received sensor start from BG source local broadcast</string>
     <string name="direction">direction</string>
     <string name="bg_generation_interval_minutes">BG generation interval minutes</string>
     <!-- Patched Ottai App -->