From b01a0fd25c2b05fef8c4c87dd6b8bca3f958a863 Mon Sep 17 00:00:00 2001 From: Navid Date: Sat, 23 Dec 2023 10:59:08 -0500 Subject: [PATCH] Use public shortTxId --- app/src/main/java/com/eveningoutpost/dexdrip/Home.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java index 1a3ef6196f..c51e539859 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java @@ -1,6 +1,7 @@ package com.eveningoutpost.dexdrip; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; +import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.shortTxId; import static com.eveningoutpost.dexdrip.models.JoH.msSince; import static com.eveningoutpost.dexdrip.models.JoH.quietratelimit; import static com.eveningoutpost.dexdrip.models.JoH.tsl; @@ -2621,7 +2622,7 @@ private void updateCurrentBgInfoCommon(DexCollectionType collector, TextView not if (!isSensorActive) { // Define a variable (notConnectedToG6Yet) that is only true if Native G6 is chosen, but, transmitter days is unknown. boolean notConnectedToG6Yet = DexCollectionType.getDexCollectionType() == DexcomG5 && Pref.getBooleanDefaultFalse("ob1_g5_use_transmitter_alg") && Pref.getBooleanDefaultFalse("using_g6") && DexTimeKeeper.getTransmitterAgeInDays(getTransmitterID()) == -1; - if (notConnectedToG6Yet || getTransmitterID().length() < 6) { // Only if G6 has been selected and transmitter days is unknown, or if G7 has been selected. + if (notConnectedToG6Yet || shortTxId()) { // Only if G6 has been selected and transmitter days is unknown, or if G7 has been selected. notificationText.setText(R.string.wait_to_connect); } else { // Only if G6 is not selected or G6 transmitter days is known. notificationText.setText(R.string.now_start_your_sensor);