File tree Expand file tree Collapse file tree 3 files changed +19
-3
lines changed
react-native-mcu-manager/ios Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change @@ -121,6 +121,8 @@ export default function settings() {
121
121
< Button
122
122
onPress = { async ( ) => {
123
123
try {
124
+ setSettingError ( null ) ;
125
+
124
126
const valueB64 = await readSetting ( selectedDeviceId , settingName ) ;
125
127
const decodedValue = Buffer . from ( valueB64 , 'base64' ) . toString (
126
128
'binary'
@@ -142,6 +144,8 @@ export default function settings() {
142
144
< Button
143
145
onPress = { async ( ) => {
144
146
try {
147
+ setSettingError ( null ) ;
148
+
145
149
const encodedValue = Buffer . from ( settingValue , 'binary' ) . toString (
146
150
'base64'
147
151
) ;
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ const useBluetoothDevices = () => {
15
15
BLEService . initializeBLE ( ) . then ( ( ) =>
16
16
bleManager . startDeviceScan (
17
17
[ ] ,
18
- { allowDuplicates : false } ,
18
+ { allowDuplicates : false , legacyScan : false } ,
19
19
( e , scannedDevice ) => {
20
20
if ( e ) {
21
21
setError ( `${ e . message } - ${ e . reason } ` ) ;
Original file line number Diff line number Diff line change @@ -112,9 +112,15 @@ public class ReactNativeMcuManagerModule: Module {
112
112
return
113
113
}
114
114
115
- let data = response? . val? . data ( using: . utf8)
115
+ let smpErr = response? . getError ( )
116
+ if ( smpErr != nil ) {
117
+ promise. reject ( Exception ( name: " ReadSettingError " , description: smpErr!. localizedDescription) )
118
+ return
119
+ }
120
+
121
+ let data = response? . val? . data ( using: . utf8) ?? Data ( )
116
122
117
- promise. resolve ( data? . base64EncodedString ( ) )
123
+ promise. resolve ( data. base64EncodedString ( ) )
118
124
}
119
125
}
120
126
@@ -142,6 +148,12 @@ public class ReactNativeMcuManagerModule: Module {
142
148
return
143
149
}
144
150
151
+ let smpErr = response? . getError ( )
152
+ if ( smpErr != nil ) {
153
+ promise. reject ( Exception ( name: " WriteSettingError " , description: smpErr!. localizedDescription) )
154
+ return
155
+ }
156
+
145
157
promise. resolve ( )
146
158
}
147
159
}
You can’t perform that action at this time.
0 commit comments