Release 3.4.1.0

.gitignore

@@ -32,4 +32,4 @@ wear/pumpcontrol/*
 *.preferences_pb
 /buildSrc/.kotlin
 .claude/settings.local.json
-/CLAUDE.md
+.claude/CLAUDE_COMMANDS.md

app/src/benchmark/kotlin/app/aaps/utils/LeakCanaryConfig.kt

@@ -0,0 +1,11 @@
+package app.aaps.utils
+
+import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
+
+@Suppress("UNUSED_PARAMETER")
+fun configureLeakCanary(
+    isEnabled: Boolean = false,
+    fabricPrivacy: FabricPrivacy? = null
+) {
+    // no-op for benchmark variant
+}

app/src/main/AndroidManifest.xml

@@ -37,7 +37,8 @@
         android:restoreAnyVersion="true"
         android:roundIcon="${appIconRound}"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Launcher">
+        android:theme="@style/AppTheme.Launcher"
+        android:networkSecurityConfig="@xml/network_security_config">
         <profileable android:shell="true" />
 
         <meta-data

app/src/main/kotlin/app/aaps/MainApp.kt

@@ -367,6 +367,17 @@ class MainApp : DaggerApplication() {
             }
         }
 
+        // Migrate Tidepool from username/password to OAuth2
+        if (sp.contains("tidepool_username") || sp.contains("tidepool_password")) {
+            sp.remove("tidepool_username")
+            sp.remove("tidepool_password")
+            sp.remove("tidepool_test_login")
+            // Clear OAuth2 state to force re-authentication
+            sp.remove("tidepool_auth_state")
+            sp.remove("tidepool_service_configuration")
+            sp.remove("tidepool_subscription_id")
+        }
+
         // Migrate loop mode
         if (config.APS && sp.contains("aps_mode")) {
             val mode = when (sp.getString("aps_mode", "CLOSED")) {

app/src/main/res/values-ru-rRU/strings.xml

@@ -20,7 +20,7 @@
     <string name="sort_items">Сортировать элементы</string>
     <string name="unitsnosemicolon">Единицы</string>
     <string name="authorizationfailed">Ошибка авторизации</string>
-    <string name="cannula">Катетер помпы</string>
+    <string name="cannula">Канюля</string>
     <string name="identification_not_set">Идентификация не задана в режиме разработчика</string>
     <!-- WEAR OS-->
     <string name="remove_selected_items">Удалить выбранные элементы</string>

app/src/main/res/values-vi-rVN/strings.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="nav_preferences_plugin">%1$s Tùy chọn</string>
+    <string name="nav_preferences_plugin">Tùy Chọn %1$s</string>
     <string name="nav_exit">Thoát</string>
     <string name="delta">Độ lệch</string>
     <string name="save">Lưu</string>
     <string name="wear">Wear</string>
     <string name="nav_about">Giới thiệu</string>
-    <string name="sensitivity_warning">Khi bật tính năng Autosense, hãy nhớ nhập đầy đủ tất cả lượng carb đã ăn. Nếu không, sự lệch carb sẽ bị nhận diện sai thành thay đổi độ nhạy insulin!!</string>
+    <string name="sensitivity_warning">Khi dùng Autosense, cần nhập đủ lượng carb đã ăn. Nếu không, hệ thống sẽ hiểu sai lệch carb thành thay đổi độ nhạy insulin</string>
     <string name="invalid">KHÔNG HỢP LỆ</string>
     <string name="gradually_increase_notification_volume">Tăng dần âm lượng cho cảnh báo và thông báo</string>
     <string name="localalertsettings_title">Cảnh báo cục bộ</string>
-    <string name="enable_missed_bg_readings_alert">Cảnh báo khi thiếu dữ liệu BG</string>
+    <string name="enable_missed_bg_readings_alert">Cảnh báo khi mất dữ liệu ĐH</string>
     <string name="enable_pump_unreachable_alert">Cảnh báo khi bơm mất kết nối</string>
     <string name="pump_unreachable_threshold">Ngưỡng mất kết nối bơm [phút]</string>
-    <string name="enable_carbs_req_alert">Cảnh báo khi cần carb</string>
+    <string name="enable_carbs_req_alert">Cảnh báo khi cần bổ sung carb</string>
     <string name="open_navigation">Mở điều hướng</string>
     <string name="close_navigation">Đóng điều hướng</string>
     <string name="remove_items">Xóa mục</string>
     <string name="sort_items">Sắp xếp các mục</string>
     <string name="unitsnosemicolon">Đơn vị</string>
     <string name="authorizationfailed">Xác thực không thành công</string>
-    <string name="cannula">Cannula</string>
+    <string name="cannula">Kim luồn</string>
     <string name="identification_not_set">Chưa thiết lập nhận dạng ở chế độ phát triển</string>
     <!-- WEAR OS-->
     <string name="remove_selected_items">Xóa mục đã chọn</string>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">localhost</domain>
+        <domain includeSubdomains="false">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>

buildSrc/src/main/kotlin/Versions.kt

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 @Suppress("ConstPropertyName")
 object Versions {
 
-    const val appVersion = "3.4.0.0"
+    const val appVersion = "3.4.1.0"
     const val versionCode = 1500
 
     const val compileSdk = 36

buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts

@@ -42,6 +42,10 @@ android {
         targetCompatibility = Versions.javaVersion
     }
 
+    kotlinOptions {
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.time.ExperimentalTime"
+    }
+
     lint {
         checkReleaseBuilds = false
         disable += "MissingTranslation"

buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts

@@ -35,6 +35,10 @@ android {
         targetCompatibility = Versions.javaVersion
     }
 
+    kotlinOptions {
+        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.time.ExperimentalTime"
+    }
+
     lint {
         checkReleaseBuilds = false
         disable += "MissingTranslation"

core/data/src/main/kotlin/app/aaps/core/data/configuration/Constants.kt

@@ -11,7 +11,7 @@ object Constants {
     const val notificationID = 556677
 
     // OpenAPS algorithm
-    const val ALLOW_SMB_WITH_HIGH_TT = 100
+    const val NORMAL_TARGET_MGDL = 99 // 5.5 mmol/l = 99.1 mg/dL; use 99 to ensure consistent behavior across mg/dL and mmol/l units
 
     // SMS COMMUNICATOR
     const val remoteBolusMinDistance = 15 * 60 * 1000L

core/data/src/main/kotlin/app/aaps/core/data/model/RM.kt

@@ -63,6 +63,7 @@ data class RM(
         fun isClosedLoopOrLgs() = this == CLOSED_LOOP || this == CLOSED_LOOP_LGS
         fun isLoopRunning() = this == OPEN_LOOP || this == CLOSED_LOOP || this == CLOSED_LOOP_LGS
         fun isSuspended() = this == DISCONNECTED_PUMP || this == SUSPENDED_BY_PUMP || this == SUSPENDED_BY_USER || this == SUSPENDED_BY_DST || this == SUPER_BOLUS
+        fun isPumpSuspended() = this == DISCONNECTED_PUMP || this == SUSPENDED_BY_PUMP
         // DISABLED_LOOP is added to "mustBeTemporary" to be properly rendered in NS
         fun mustBeTemporary() = this == DISCONNECTED_PUMP || this == SUSPENDED_BY_PUMP || this == SUSPENDED_BY_USER || this == SUSPENDED_BY_DST || this == SUPER_BOLUS || this == DISABLED_LOOP
 

core/data/src/main/kotlin/app/aaps/core/data/pump/defs/PumpType.kt

@@ -7,7 +7,7 @@ package app.aaps.core.data.pump.defs
 enum class PumpType(
     val description: String,
     private val manufacturer: ManufacturerType? = null,
-    private val model: String = "NONE",
+    val model: String = "NONE",
     private val bolusSize: Double = 0.0,
     private val specialBolusSize: DoseStepSize? = null,
     private val extendedBolusSettings: DoseSettings? = null,

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BlePreCheck.kt

@@ -4,5 +4,6 @@ import androidx.appcompat.app.AppCompatActivity
 
 interface BlePreCheck {
 
-    fun prerequisitesCheck(activity: AppCompatActivity): Boolean
+    fun prerequisitesCheck(activity: AppCompatActivity, additionalPermissions: List<String>? = null): Boolean
+
 }

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/BolusProgressData.kt

@@ -20,6 +20,7 @@ object BolusProgressData {
         bolusEnded = false
         stopPressed = false
         status = ""
+        wearStatus = ""
         percent = 0
     }
 
@@ -48,6 +49,7 @@ object BolusProgressData {
      * Last received status update
      */
     var status = ""
+    var wearStatus = ""
     var percent = 0
 
     var bolusEnded = false

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/rx/events/EventOverviewBolusProgress.kt

@@ -8,12 +8,13 @@ import kotlin.math.min
 /**
  * Custom status message and percent
  */
-class EventOverviewBolusProgress(status: String, val id: Long? = null, percent: Int? = null) : Event() {
+class EventOverviewBolusProgress(status: String, val id: Long? = null, percent: Int? = null, wearStatus: String? = null) : Event() {
 
     init {
         if (id == BolusProgressData.id || id == null) {
             BolusProgressData.status = status
             percent?.let { BolusProgressData.percent = it }
+            BolusProgressData.wearStatus = wearStatus ?: status
         }
     }
 
@@ -22,9 +23,10 @@ class EventOverviewBolusProgress(status: String, val id: Long? = null, percent:
      */
     constructor(rh: ResourceHelper, delivered: Double, id: Long? = null) :
         this(
-            rh.gs(R.string.bolus_delivering, delivered),
+            status = rh.gs(R.string.bolus_delivering, delivered),
             id = id,
-            percent = min((delivered / BolusProgressData.insulin * 100).toInt(), 100)
+            percent = min((delivered / BolusProgressData.insulin * 100).toInt(), 100),
+            wearStatus = rh.gs(R.string.bolus_delivered_so_far, delivered, BolusProgressData.insulin)
         )
 
     /**
@@ -37,6 +39,9 @@ class EventOverviewBolusProgress(status: String, val id: Long? = null, percent:
                 if (percent == 100) rh.gs(R.string.bolus_delivered_successfully, BolusProgressData.insulin)
                 else rh.gs(R.string.bolus_delivering, BolusProgressData.insulin * percent / 100.0),
             id = id,
-            percent = min(percent, 100)
-        )
+            percent = min(percent, 100),
+            wearStatus =
+                if (percent == 100) rh.gs(R.string.bolus_delivered_successfully, BolusProgressData.insulin)
+                else rh.gs(R.string.bolus_delivered_so_far, BolusProgressData.insulin * percent / 100.0, BolusProgressData.insulin)
+    )
 }

core/interfaces/src/main/res/values-cs-rCZ/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Podávání %1$.2fU</string>
+    <string name="bolus_delivered_so_far">%1$.2fU / %2$.2fU podáno</string>
     <string name="bolus_delivered_successfully">Bolus %1$.2fU byl úspěšně aplikován</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Změněn ovladač pumpy.</string>

core/interfaces/src/main/res/values-es-rES/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Entregando %1$.2fU</string>
+    <string name="bolus_delivered_so_far">%1$.2fU / %2$.2fU entregado</string>
     <string name="bolus_delivered_successfully">Bolo %1$.2fU entregado con éxito</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Controlador de bomba cambiado</string>

core/interfaces/src/main/res/values-it-rIT/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Erogazione di %1$.2fU</string>
+    <string name="bolus_delivered_so_far">%1$.2f U / %2$.2f U erogate</string>
     <string name="bolus_delivered_successfully">Bolo di %1$.2fU erogato con successo</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Driver micro cambiato.</string>

core/interfaces/src/main/res/values-nb-rNO/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Leverer %1$.2f E</string>
+    <string name="bolus_delivered_so_far">%1$.2f E / %2$.2f E levert</string>
     <string name="bolus_delivered_successfully">Bolus på %1$.2f E ble levert</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Pumpedriver er endret.</string>

core/interfaces/src/main/res/values-nl-rNL/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Toedienen van %1$.2fE</string>
+    <string name="bolus_delivered_so_far">%1$.2f E / %2$.2f E toegediend</string>
     <string name="bolus_delivered_successfully">Bolus van %1$.2fE succesvol toegediend</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Pomp stuurprogramma gewijzigd.</string>
@@ -12,6 +13,18 @@
     <string name="hoursago">%1$.1fu geleden</string>
     <string name="days_ago">%1$.1f dagen geleden</string>
     <string name="days_ago_round">%1$.0f dagen geleden</string>
+    <plurals name="plurals_day_hour_ago">
+        <item quantity="one">%1$s dag %2$s uur geleden</item>
+        <item quantity="other">%1$s dagen %2$s uur geleden</item>
+    </plurals>
+    <plurals name="plurals_hour_ago">
+        <item quantity="one">%1$s uur geleden</item>
+        <item quantity="other">%1$s uur geleden</item>
+    </plurals>
+    <plurals name="plurals_minute_ago">
+        <item quantity="one">een moment geleden</item>
+        <item quantity="other">%1$s minuten geleden</item>
+    </plurals>
     <string name="seconds_ago">seconden geleden</string>
     <string name="in_days">over %1$.0f dagen</string>
     <string name="in_days_round">binnen %1$.0f dagen</string>

core/interfaces/src/main/res/values-pl-rPL/strings.xml

@@ -1,12 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    Events-->
+    <string name="bolus_delivering">Dostarczam %1$.2fU</string>
+    <string name="bolus_delivered_successfully">Bolus %1$.2fU dostarczony prawidłowo</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Zmieniono ster. pompy.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$dmin temu</string>
+    <string name="secago">%1$ds temu</string>
     <string name="minago_long">%1$d minut temu</string>
+    <string name="hoursago">%1$.1fh temu</string>
     <string name="days_ago">%1$.1f dni temu</string>
     <string name="days_ago_round">%1$.0f dni temu</string>
+    <plurals name="plurals_day_hour_ago">
+        <item quantity="one">%1$s dzień %2$s godziny temu</item>
+        <item quantity="few">%1$s dni %2$s godziny temu</item>
+        <item quantity="many">%1$s dni %2$s godziny temu</item>
+        <item quantity="other">%1$s dni %2$s godziny temu</item>
+    </plurals>
+    <plurals name="plurals_hour_ago">
+        <item quantity="one">%1$s godzinę temu</item>
+        <item quantity="few">%1$s godziny temu</item>
+        <item quantity="many">%1$s godzin temu</item>
+        <item quantity="other">%1$s godzin temu</item>
+    </plurals>
+    <plurals name="plurals_minute_ago">
+        <item quantity="one">chwilę temu</item>
+        <item quantity="few">%1$s minuty temu</item>
+        <item quantity="many">%1$s minut temu</item>
+        <item quantity="other">%1$s minut temu</item>
+    </plurals>
+    <string name="seconds_ago">sekundy temu</string>
     <string name="in_days">za %1$.0f dni</string>
     <string name="in_days_round">za %1$.0f dni</string>
     <string name="shorthour">h</string>
@@ -32,6 +56,7 @@
     <string name="connecting_for">Łączenie przez %1$d s</string>
     <string name="handshaking">Nawiązywanie połączenia</string>
     <string name="connected">Połączono</string>
+    <string name="authorized">Zautoryzowano</string>
     <string name="disconnecting">Rozłączanie</string>
     <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
     <!-- Custom Watchface -->
@@ -65,4 +90,8 @@
     <string name="default_custom_watchface_external_comment">Domyślna tarcza zegarka, w tym zewnętrzne podglądy dla obserwujących. Możesz kliknąć na przycisk EKSPORT TARCZY aby wygenerować szablon</string>
     <string name="wear_default_watchface">Domyślna Tarcza</string>
     <string name="wear_more_watchfaces">Więcej tarcz zegarka</string>
+    <string name="temp_basal_absolute_rate">%1$.2f U/h @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f%% @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_extended_bolus">E %1$.2f U/h @%2$s %3$d/%4$d min</string>
+    <string name="forever">Na zawsze</string>
 </resources>

core/interfaces/src/main/res/values-ru-rRU/strings.xml

@@ -2,14 +2,15 @@
 <resources>
     <!--    Events-->
     <string name="bolus_delivering">Подается %1$.2fед</string>
+    <string name="bolus_delivered_so_far">Введено %1$.2fед / %2$.2fед</string>
     <string name="bolus_delivered_successfully">Болюс %1$.2fед. введен успешно</string>
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Драйвер помпы изменен.</string>
     <!--    DateUtil-->
-    <string name="minago">%1$d мин. назад</string>
+    <string name="minago">%1$d мин назад</string>
     <string name="secago">%1$d сек назад</string>
     <string name="minago_long">%1$d минут назад</string>
-    <string name="hoursago">%1$.1fч. назад</string>
+    <string name="hoursago">%1$.1fч назад</string>
     <string name="days_ago">%1$s дн назад</string>
     <string name="days_ago_round">%1$s дн назад</string>
     <plurals name="plurals_day_hour_ago">
@@ -55,9 +56,9 @@
     <!-- Rx -->
     <string name="connecting_for">Связь установлена за %1$d сек</string>
     <string name="handshaking">Подтверждение связи</string>
-    <string name="connected">соединение установлено</string>
+    <string name="connected">Подключено</string>
     <string name="authorized">Авторизовано</string>
-    <string name="disconnecting">разъединение</string>
+    <string name="disconnecting">Разъединение</string>
     <string name="waiting_for_disconnection">Ожидание разъединения</string>
     <!-- Custom Watchface -->
     <string name="metadata_label_watchface_created_at">Создано: %1$s</string>
@@ -91,7 +92,7 @@
     <string name="wear_default_watchface">Циферблат по умолчанию</string>
     <string name="wear_more_watchfaces">Еще циферблаты</string>
     <string name="temp_basal_absolute_rate">%1$.2f ед/ч @%2$s %3$d/%4$d\'</string>
-    <string name="temp_basal_percent_rate">%1$.2f ед/ч @%2$s %3$d/%4$d\'</string>
+    <string name="temp_basal_percent_rate">%1$.2f % @%2$s %3$d/%4$d\'</string>
     <string name="temp_basal_extended_bolus">E %1$.2f ед/ч @%2$s %3$d/%4$d мин</string>
     <string name="forever">Навсегда</string>
 </resources>