react-native-mytatva-rn-sdk 1.2.85 → 1.2.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt +6 -6
- package/android/src/main/java/com/mytatvarnsdk/activity/ConnectSensorActivity.kt +3 -3
- package/ios/MyReactNativeBridge.m +12 -12
- package/ios/ViewControllers/ConnectToSensorViewController.swift +2 -2
- package/package.json +1 -1
|
@@ -100,7 +100,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
|
|
|
100
100
|
var mReactContext: ReactApplicationContext? = null
|
|
101
101
|
var userToken: String = ""
|
|
102
102
|
var env: String = ""
|
|
103
|
-
var
|
|
103
|
+
var lastConnectCgm: String = ""
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
override fun getName(): String {
|
|
@@ -110,17 +110,17 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
|
|
|
110
110
|
private fun updateUserData(data: ReadableMap?) {
|
|
111
111
|
currentUserData = data
|
|
112
112
|
// Always reset so stale values from a previous user don't persist
|
|
113
|
-
|
|
113
|
+
lastConnectCgm = ""
|
|
114
114
|
try {
|
|
115
115
|
if (data != null && data.hasKey("patient_meta_info")) {
|
|
116
116
|
val patientMetaInfo = data.getMap("patient_meta_info")
|
|
117
|
-
if (patientMetaInfo != null && patientMetaInfo.hasKey("
|
|
118
|
-
|
|
119
|
-
Log.d("updateUserData", "
|
|
117
|
+
if (patientMetaInfo != null && patientMetaInfo.hasKey("last_connect_cgm")) {
|
|
118
|
+
lastConnectCgm = patientMetaInfo.getString("last_connect_cgm") ?: ""
|
|
119
|
+
Log.d("updateUserData", "lastConnectCgm: $lastConnectCgm")
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
} catch (e: Exception) {
|
|
123
|
-
Log.e("updateUserData", "Error extracting
|
|
123
|
+
Log.e("updateUserData", "Error extracting last_connect_cgm: ${e.message}")
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
|
|
@@ -299,10 +299,10 @@ class ConnectSensorActivity : BaseBleActivity() {
|
|
|
299
299
|
if (requestCode == REQUEST_QR && resultCode == RESULT_OK && data != null) {
|
|
300
300
|
val device: PocDevice? = data.getParcelableExtra("device")
|
|
301
301
|
if (device != null) {
|
|
302
|
-
val
|
|
303
|
-
Log.d("ConnectSensor", "
|
|
302
|
+
val lastConnectCgm = CgmTrackyLibModule.lastConnectCgm
|
|
303
|
+
Log.d("ConnectSensor", "lastConnectCgm: $lastConnectCgm")
|
|
304
304
|
|
|
305
|
-
if (
|
|
305
|
+
if (lastConnectCgm.equals("Diasens", ignoreCase = true)) {
|
|
306
306
|
// Diasens user - validate sensor ID against API
|
|
307
307
|
validateDiasensSensor(device)
|
|
308
308
|
} else {
|
|
@@ -444,18 +444,18 @@ RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token envType:(NSString *)envType
|
|
|
444
444
|
[defaults setBool:false forKey:@"isForReconnect"];
|
|
445
445
|
[defaults setObject:envType forKey:@"envType"];
|
|
446
446
|
|
|
447
|
-
// Extract and store
|
|
448
|
-
NSString *
|
|
447
|
+
// Extract and store lastConnectCgm from userData
|
|
448
|
+
NSString *lastConnectCgm = @"";
|
|
449
449
|
if (userData != nil) {
|
|
450
450
|
NSDictionary *patientMetaInfo = userData[@"patient_meta_info"];
|
|
451
451
|
if (patientMetaInfo != nil && [patientMetaInfo isKindOfClass:[NSDictionary class]]) {
|
|
452
|
-
NSString *
|
|
453
|
-
if (
|
|
454
|
-
|
|
452
|
+
NSString *rawValue = patientMetaInfo[@"last_connect_cgm"];
|
|
453
|
+
if (rawValue != nil && [rawValue isKindOfClass:[NSString class]]) {
|
|
454
|
+
lastConnectCgm = rawValue;
|
|
455
455
|
}
|
|
456
456
|
}
|
|
457
457
|
}
|
|
458
|
-
[defaults setObject:
|
|
458
|
+
[defaults setObject:lastConnectCgm forKey:@"lastConnectCgm"];
|
|
459
459
|
|
|
460
460
|
[defaults synchronize];
|
|
461
461
|
|
|
@@ -486,18 +486,18 @@ RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token envType:(NSString *)envT
|
|
|
486
486
|
[defaults setBool:YES forKey:@"isForReconnect"];
|
|
487
487
|
[defaults setObject:envType forKey:@"envType"];
|
|
488
488
|
|
|
489
|
-
// Extract and store
|
|
490
|
-
NSString *
|
|
489
|
+
// Extract and store lastConnectCgm from userData
|
|
490
|
+
NSString *lastConnectCgm = @"";
|
|
491
491
|
if (userData != nil) {
|
|
492
492
|
NSDictionary *patientMetaInfo = userData[@"patient_meta_info"];
|
|
493
493
|
if (patientMetaInfo != nil && [patientMetaInfo isKindOfClass:[NSDictionary class]]) {
|
|
494
|
-
NSString *
|
|
495
|
-
if (
|
|
496
|
-
|
|
494
|
+
NSString *rawValue = patientMetaInfo[@"last_connect_cgm"];
|
|
495
|
+
if (rawValue != nil && [rawValue isKindOfClass:[NSString class]]) {
|
|
496
|
+
lastConnectCgm = rawValue;
|
|
497
497
|
}
|
|
498
498
|
}
|
|
499
499
|
}
|
|
500
|
-
[defaults setObject:
|
|
500
|
+
[defaults setObject:lastConnectCgm forKey:@"lastConnectCgm"];
|
|
501
501
|
|
|
502
502
|
[defaults synchronize];
|
|
503
503
|
|
|
@@ -252,9 +252,9 @@ class ConnectToSensorViewController: UIViewController {
|
|
|
252
252
|
UserDefaults.standard.set(data.r, forKey: "algo_r")
|
|
253
253
|
UserDefaults.standard.synchronize()
|
|
254
254
|
|
|
255
|
-
let
|
|
255
|
+
let lastConnectCgm = UserDefaults.standard.string(forKey: "lastConnectCgm") ?? ""
|
|
256
256
|
|
|
257
|
-
if
|
|
257
|
+
if lastConnectCgm.lowercased() == "diasens" {
|
|
258
258
|
// Diasens user - validate sensor via API before connecting
|
|
259
259
|
validateDiasensSensor(sensorId: value)
|
|
260
260
|
} else {
|