Merge pull request #129 from 0pen-dash/avereha/i8n-expiration

updates
This commit is contained in:
Andrei Vereha 2021-09-23 09:52:15 +02:00 committed by GitHub
commit d516cfefed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions

View file

@ -124,9 +124,7 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
binding.buttonDiscardPod.visibility = discardButtonEnabled.toVisibility()
binding.buttonActivatePod.isEnabled = podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
binding.buttonDeactivatePod.isEnabled =
podStateManager.ltk != null ||
podStateManager.podStatus == PodStatus.ALARM
binding.buttonDeactivatePod.isEnabled = podStateManager.bluetoothAddress != null
if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)) {
if (commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class.java)) {

View file

@ -244,9 +244,6 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
private fun updateBluetoothConnectionStatus(event: EventPumpStatusChanged) {
var status = event.getStatus(resourceHelper)
if (status.isEmpty()) {
status = resourceHelper.gs(R.string.disconnected)
}
bluetoothStatusBinding.omnipodDashBluetoothStatus.text = status
}