caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

combov2: Use custom Bluetooth strings instead of reusing BLE ones

Browse source 
The Combo does not use Bluetooth Low Energy, but rather Bluetooth Classic,
so don't use BLE strings for notificiations.
This commit is contained in:
Carlos Rafael Giani 2023-08-05 15:21:17 +02:00
parent 911c446190
commit 0f668472a4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
View file

@ -349,7 +349,7 @@ class ComboV2Plugin @Inject constructor (
} catch (_: BluetoothNotEnabledException) {
uiInteraction.addNotification(
Notification.BLUETOOTH_NOT_ENABLED,
text = rh.gs(info.nightscout.core.ui.R.string.ble_not_enabled),
text = rh.gs(R.string.combov2_bluetooth_disabled),
level = Notification.INFO
)
@ -761,7 +761,7 @@ class ComboV2Plugin @Inject constructor (
} catch (_: BluetoothNotEnabledException) {
uiInteraction.addNotification(
Notification.BLUETOOTH_NOT_ENABLED,
text = rh.gs(info.nightscout.core.ui.R.string.ble_not_enabled),
text = rh.gs(R.string.combov2_bluetooth_disabled),
level = Notification.INFO
)
} catch (e: Exception) {

1
pump/combov2/src/main/res/values/strings.xml
View file

@ -139,4 +139,5 @@ buttons at the same time to cancel pairing)\n
<string name="combov2_refresh_pump_status_after_error">Refreshing pump status after the pump reported an error</string>
<string name="combov2_go_back">Go back</string>
<string name="combov2_cannot_pair_driver_not_initialized_explanation">Cannot perform pairing because the driver is not initialized. This typically happens because the necessary Bluetooth permissions have not been granted. Go back, grant the Bluetooth permissions, then try again to pair.</string>
<string name="combov2_bluetooth_disabled">Cannot start driver - Bluetooth is disabled</string>
</resources>