Libre 2 : replaced error message 'error while reading multiple blocks...' by message saying user should retry
This commit is contained in:
Johan Degraeve
parent
a1fa376607
commit
6ccb0c2634
|
|
@ -150,8 +150,12 @@ class LibreNFC: NSObject, NFCTagReaderSessionDelegate {
|
|||
|
||||
if let error = error {
|
||||
|
||||
self.trace(systemError: error, ownErrorString: "error while reading multiple blocks (#\(i * requestBlocks) - #\(i * requestBlocks + (i == requests - 1 ? (remainder == 0 ? requestBlocks : remainder) : requestBlocks) - (requestBlocks > 1 ? 1 : 0))):", invalidateSession: true, session: session)
|
||||
let debugInfo = "error while reading multiple blocks (#\(i * requestBlocks) - #\(i * requestBlocks + (i == requests - 1 ? (remainder == 0 ? requestBlocks : remainder) : requestBlocks) - (requestBlocks > 1 ? 1 : 0))):"
|
||||
|
||||
xdrip.trace("%{public}@", log: self.log, category: ConstantsLog.categoryLibreNFC, type: .info, debugInfo)
|
||||
|
||||
self.trace(systemError: error, ownErrorString: TextsLibreNFC.nfcErrorRetryScan, invalidateSession: true, session: session)
|
||||
|
||||
if i != requests - 1 { return }
|
||||
|
||||
} else {
|
||||
|
|
@ -326,9 +330,13 @@ class LibreNFC: NSObject, NFCTagReaderSessionDelegate {
|
|||
blockArray, error in
|
||||
|
||||
if let error = error {
|
||||
|
||||
let debugInfo = "error while reading multiple blocks (#\(i * requestBlocks) - #\(i * requestBlocks + (i == requests - 1 ? (remainder == 0 ? requestBlocks : remainder) : requestBlocks) - (requestBlocks > 1 ? 1 : 0))):"
|
||||
|
||||
self.trace(systemError: error, ownErrorString: "error while reading multiple blocks (#\(i * requestBlocks) - #\(i * requestBlocks + (i == requests - 1 ? (remainder == 0 ? requestBlocks : remainder) : requestBlocks) - (requestBlocks > 1 ? 1 : 0))):", invalidateSession: true, session: session)
|
||||
xdrip.trace("%{public}@", log: self.log, category: ConstantsLog.categoryLibreNFC, type: .info, debugInfo)
|
||||
|
||||
self.trace(systemError: error, ownErrorString: TextsLibreNFC.nfcErrorRetryScan, invalidateSession: true, session: session)
|
||||
|
||||
if i != requests - 1 { return }
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -26,3 +26,11 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
||||
|
|
|
|||
|
|
@ -25,3 +25,11 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@
|
|||
"deviceMustSupportIOS14" = "To connect to Libre 2, this iPhone needs upgrading to iOS14";
|
||||
"donotusethelibrelinkapp" = "Connected to Libre 2.\r\n\r\nIf you want to keeping scanning sometimes the Libre sensor with the official Libre app, then disallow bluetooth permission for the Libre app. \r\n\r\nOtherwise, scanning the NFC with the Libre app and with the bluetooth permission allowed will break the connection between xDrip4iOS and the Libre 2.";
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
|
|
|||
|
|
@ -10,3 +10,11 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
||||
|
|
|
|||
|
|
@ -10,3 +10,11 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
||||
|
|
|
|||
|
|
@ -24,3 +24,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -24,3 +24,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -4,9 +4,8 @@
|
|||
"deviceMustSupportIOS14" = "Om te verbinden met Libre 2 moet deze iPhone worden geüpgraded naar iOS 14";
|
||||
"donotusethelibrelinkapp" = "Verbonden met Libre 2.\r\n\r\nIndien je de Libre sensor wilt blijven scannen met de officiële Libre app, trek dan de toegang tot bluetooth in voor de Libre app. \r\n\r\nIndien de sensor wordt gescand met de Libre app terwijl deze nog toegang heeft tot bluetooth, verbreekt de verbinding tussen xDrip4iOS en de Libre 2.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect' or go back to previous screen, add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "Je hebt blijkbaar een nieuwe sensor gescand maar xDrip4iOS maakt nog altijd de Bluetooth verbinding naar de vorige sensor.\r\n\r\nOm dit op te lossen :\r\n- Klik 'Loskoppelen'\r\n- Keer terug naar het vorige scherm en voeg een nieuwe CGM toe, type Libre 2, en scan opnieuw.\r\n\r\nxDrip4iOS zal nu proberen te verbinden met de nieuwe sensor.";
|
||||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Fout tijdens scan. Click 'scan' linksboven opnieuw of klik 'Vorige' en voeg opnieuw de Libre 2 toe, en scan de sensor opnieuw";
|
||||
|
|
|
|||
|
|
@ -24,3 +24,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -4,3 +4,11 @@
|
|||
"deviceMustSupportIOS14" = "Para ligar ao Libre 2, este iPhone precisa de ser actualizado para iOS14";
|
||||
"donotusethelibrelinkapp" = "Ligado ao Libre 2.\r\n\r\nSe quiser fazer leituras NFC com a app oficial do Libre, então desactive permissão Bluetooth para a app oficial do Libre. \r\n\r\nSenão, as leituras NFC com a app do Libre com a permissão do bluetooth activada vai romper a ligação entre xDrip4iOS e o Libre 2.";
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "Parece que foi lido um novo sensor, mas xDrip4iOS ligado ao sensor antigo.\r\n\r\Para resolver :\r\n- Pressionar em 'Desligar'\r\n- Voltar ao menu anterior e adicionar um novo CGM do tipo Libre 2 e pesquisar novamente.\r\n\r\nxDrip4iOS deverá ligar-se ao novo sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.";
|
||||
|
||||
|
|
|
|||
|
|
@ -24,3 +24,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -11,3 +11,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -24,3 +24,10 @@
|
|||
|
||||
/// The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.
|
||||
"connectedLibre2DoesNotMatchScannedLibre2" = "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.";
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///// Translation needed - remove this header after translation /////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/// Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user
|
||||
"nfcErrorRetryScan" = "Error occured while scanning the sensor. Click 'Scan' top left and scan the sensor again";
|
||||
|
|
|
|||
|
|
@ -28,4 +28,8 @@ class TextsLibreNFC {
|
|||
return NSLocalizedString("connectedLibre2DoesNotMatchScannedLibre2", tableName: filename, bundle: Bundle.main, value: "You seem to have scanned a new sensor, but xDrip4iOS is having the Bluetooth connection to the old sensor.\r\n\r\nTo solve this :\r\n- Click 'disconnect'\r\n- Go back to previous screen and add a new CGM of type Libre 2 and scan again.\r\n\r\nxDrip4iOS should now connect to the new sensor.", comment: "The user has connected to another (older?) Libre 2 with bluetooth than the one for which NFC scan was done, in that case, inform user that he/she should click 'disconnect', add a new CGM sensor and scan again.")
|
||||
}()
|
||||
|
||||
static let nfcErrorRetryScan: String = {
|
||||
return NSLocalizedString("nfcErrorRetryScan", tableName: filename, bundle: Bundle.main, value: "Error occured while scanning the sensor. Click 'Scan' top left or click 'back' and add the Libre 2 again, and scan again.", comment: "Sometimes NFC scanning creates errors, retrying solves the problem. This is to explain this to the user")
|
||||
}()
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue