Skip to content

Commit 3a4dcb7

Browse files
committed
fix: comprehensive React Native 0.80.0+ compatibility fix
- Fix all 35 instances of null error codes in promise.reject calls - Include both safePromise.reject and promise.reject fixes - Address React Native 0.80.0+ null-safety requirements - Resolves crashes in BLE operations with RN 0.81.4+ This completes PR #1311 which was missing safePromise.reject fixes. Resolves: #1310
1 parent e666a8d commit 3a4dcb7

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

android/src/main/java/com/bleplx/BlePlxModule.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void onSuccess(Void data) {
168168
}, new OnErrorCallback() {
169169
@Override
170170
public void onError(BleError error) {
171-
safePromise.reject(null, errorConverter.toJs(error));
171+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
172172
}
173173
});
174174
}
@@ -187,7 +187,7 @@ public void onSuccess(Void data) {
187187
}, new OnErrorCallback() {
188188
@Override
189189
public void onError(BleError error) {
190-
safePromise.reject(null, errorConverter.toJs(error));
190+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
191191
}
192192
});
193193
}
@@ -273,7 +273,7 @@ public void onSuccess(Device[] data) {
273273
}, new OnErrorCallback() {
274274
@Override
275275
public void onError(BleError error) {
276-
promise.reject(null, errorConverter.toJs(error));
276+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
277277
}
278278
});
279279
}
@@ -296,7 +296,7 @@ public void onSuccess(Device[] data) {
296296
}, new OnErrorCallback() {
297297
@Override
298298
public void onError(BleError error) {
299-
promise.reject(null, errorConverter.toJs(error));
299+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
300300
}
301301
});
302302
}
@@ -318,7 +318,7 @@ public void onSuccess(Device data) {
318318
}, new OnErrorCallback() {
319319
@Override
320320
public void onError(BleError error) {
321-
safePromise.reject(null, errorConverter.toJs(error));
321+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
322322
}
323323
});
324324
}
@@ -338,7 +338,7 @@ public void onSuccess(Device data) {
338338
}, new OnErrorCallback() {
339339
@Override
340340
public void onError(BleError error) {
341-
safePromise.reject(null, errorConverter.toJs(error));
341+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
342342
}
343343
});
344344
}
@@ -358,7 +358,7 @@ public void onSuccess(Device data) {
358358
}, new OnErrorCallback() {
359359
@Override
360360
public void onError(BleError error) {
361-
safePromise.reject(null, errorConverter.toJs(error));
361+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
362362
}
363363
});
364364
}
@@ -422,7 +422,7 @@ public void onEvent(ConnectionState connectionState) {
422422
new OnErrorCallback() {
423423
@Override
424424
public void onError(BleError error) {
425-
safePromise.reject(null, errorConverter.toJs(error));
425+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
426426
}
427427
});
428428
}
@@ -442,7 +442,7 @@ public void onSuccess(Device data) {
442442
}, new OnErrorCallback() {
443443
@Override
444444
public void onError(BleError error) {
445-
safePromise.reject(null, errorConverter.toJs(error));
445+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
446446
}
447447
});
448448
}
@@ -461,7 +461,7 @@ public void onSuccess(Boolean isConnected) {
461461
}, new OnErrorCallback() {
462462
@Override
463463
public void onError(BleError error) {
464-
promise.reject(null, errorConverter.toJs(error));
464+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
465465
}
466466
});
467467
}
@@ -483,7 +483,7 @@ public void onSuccess(Device data) {
483483
}, new OnErrorCallback() {
484484
@Override
485485
public void onError(BleError error) {
486-
safePromise.reject(null, errorConverter.toJs(error));
486+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
487487
}
488488
});
489489
}
@@ -503,7 +503,7 @@ public void servicesForDevice(final String deviceId, final Promise promise) {
503503
}
504504
promise.resolve(jsArray);
505505
} catch (BleError error) {
506-
promise.reject(null, errorConverter.toJs(error));
506+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
507507
}
508508

509509
}
@@ -524,7 +524,7 @@ public void characteristicsForDevice(final String deviceId,
524524
}
525525
promise.resolve(jsCharacteristics);
526526
} catch (BleError error) {
527-
promise.reject(null, errorConverter.toJs(error));
527+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
528528
}
529529
}
530530

@@ -541,7 +541,7 @@ public void characteristicsForService(final int serviceIdentifier, final Promise
541541
}
542542
promise.resolve(jsCharacteristics);
543543
} catch (BleError error) {
544-
promise.reject(null, errorConverter.toJs(error));
544+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
545545
}
546546
}
547547

@@ -561,7 +561,7 @@ public void descriptorsForDevice(final String deviceIdentifier,
561561
}
562562
promise.resolve(jsDescriptors);
563563
} catch (BleError error) {
564-
promise.reject(null, errorConverter.toJs(error));
564+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
565565
}
566566
}
567567

@@ -580,7 +580,7 @@ public void descriptorsForService(final int serviceIdentifier,
580580
}
581581
promise.resolve(jsDescriptors);
582582
} catch (BleError error) {
583-
promise.reject(null, errorConverter.toJs(error));
583+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
584584
}
585585
}
586586

@@ -598,7 +598,7 @@ public void descriptorsForCharacteristic(final int characteristicIdentifier,
598598
}
599599
promise.resolve(jsDescriptors);
600600
} catch (BleError error) {
601-
promise.reject(null, errorConverter.toJs(error));
601+
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
602602
}
603603
}
604604

@@ -627,7 +627,7 @@ public void onSuccess(Characteristic data) {
627627
}, new OnErrorCallback() {
628628
@Override
629629
public void onError(BleError error) {
630-
safePromise.reject(null, errorConverter.toJs(error));
630+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
631631
}
632632
}
633633
);
@@ -654,7 +654,7 @@ public void onSuccess(Characteristic data) {
654654
}, new OnErrorCallback() {
655655
@Override
656656
public void onError(BleError error) {
657-
safePromise.reject(null, errorConverter.toJs(error));
657+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
658658
}
659659
}
660660
);
@@ -680,7 +680,7 @@ public void onSuccess(Characteristic data) {
680680
}, new OnErrorCallback() {
681681
@Override
682682
public void onError(BleError error) {
683-
safePromise.reject(null, errorConverter.toJs(error));
683+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
684684
}
685685
});
686686
}
@@ -706,7 +706,7 @@ public void onSuccess(Characteristic data) {
706706
}, new OnErrorCallback() {
707707
@Override
708708
public void onError(BleError error) {
709-
safePromise.reject(null, errorConverter.toJs(error));
709+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
710710
}
711711
}
712712
);
@@ -732,7 +732,7 @@ public void onSuccess(Characteristic data) {
732732
}, new OnErrorCallback() {
733733
@Override
734734
public void onError(BleError error) {
735-
safePromise.reject(null, errorConverter.toJs(error));
735+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
736736
}
737737
}
738738
);
@@ -757,7 +757,7 @@ public void onSuccess(Characteristic data) {
757757
}, new OnErrorCallback() {
758758
@Override
759759
public void onError(BleError error) {
760-
safePromise.reject(null, errorConverter.toJs(error));
760+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
761761
}
762762
}
763763
);
@@ -788,7 +788,7 @@ public void onEvent(Characteristic data) {
788788
}, new OnErrorCallback() {
789789
@Override
790790
public void onError(BleError error) {
791-
safePromise.reject(null, errorConverter.toJs(error));
791+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
792792
}
793793
}
794794
);
@@ -818,7 +818,7 @@ public void onEvent(Characteristic data) {
818818
}, new OnErrorCallback() {
819819
@Override
820820
public void onError(BleError error) {
821-
safePromise.reject(null, errorConverter.toJs(error));
821+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
822822
}
823823
}
824824
);
@@ -848,7 +848,7 @@ public void onEvent(Characteristic data) {
848848
}, new OnErrorCallback() {
849849
@Override
850850
public void onError(BleError error) {
851-
safePromise.reject(null, errorConverter.toJs(error));
851+
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
852852
}
853853
}
854854
);
@@ -878,7 +878,7 @@ public void onSuccess(Descriptor descriptor) {
878878
}, new OnErrorCallback() {
879879
@Override
880880
public void onError(BleError bleError) {
881-
promise.reject(null, errorConverter.toJs(bleError));
881+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
882882
}
883883
});
884884
}
@@ -906,7 +906,7 @@ public void onSuccess(Descriptor descriptor) {
906906
new OnErrorCallback() {
907907
@Override
908908
public void onError(BleError bleError) {
909-
promise.reject(null, errorConverter.toJs(bleError));
909+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
910910
}
911911
});
912912
}
@@ -932,7 +932,7 @@ public void onSuccess(Descriptor descriptor) {
932932
new OnErrorCallback() {
933933
@Override
934934
public void onError(BleError bleError) {
935-
promise.reject(null, errorConverter.toJs(bleError));
935+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
936936
}
937937
});
938938
}
@@ -956,7 +956,7 @@ public void onSuccess(Descriptor descriptor) {
956956
new OnErrorCallback() {
957957
@Override
958958
public void onError(BleError bleError) {
959-
promise.reject(null, errorConverter.toJs(bleError));
959+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
960960
}
961961
});
962962
}
@@ -988,7 +988,7 @@ public void onSuccess(Descriptor descriptor) {
988988
new OnErrorCallback() {
989989
@Override
990990
public void onError(BleError bleError) {
991-
promise.reject(null, errorConverter.toJs(bleError));
991+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
992992
}
993993
}
994994
);
@@ -1019,7 +1019,7 @@ public void onSuccess(Descriptor descriptor) {
10191019
new OnErrorCallback() {
10201020
@Override
10211021
public void onError(BleError bleError) {
1022-
promise.reject(null, errorConverter.toJs(bleError));
1022+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
10231023
}
10241024
}
10251025
);
@@ -1048,7 +1048,7 @@ public void onSuccess(Descriptor descriptor) {
10481048
new OnErrorCallback() {
10491049
@Override
10501050
public void onError(BleError bleError) {
1051-
promise.reject(null, errorConverter.toJs(bleError));
1051+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
10521052
}
10531053
}
10541054
);
@@ -1075,7 +1075,7 @@ public void onSuccess(Descriptor descriptor) {
10751075
new OnErrorCallback() {
10761076
@Override
10771077
public void onError(BleError bleError) {
1078-
promise.reject(null, errorConverter.toJs(bleError));
1078+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
10791079
}
10801080
}
10811081
);
@@ -1101,7 +1101,7 @@ private boolean isRequestPossibleHandler(String functionName, final Promise prom
11011101
if(this.bleAdapter == null){
11021102
BleError bleError = new BleError(BleErrorCode.BluetoothManagerDestroyed, String.format("BleManager cannot call the %s function because BleManager has been destroyed", functionName), null);
11031103

1104-
promise.reject(null, errorConverter.toJs(bleError));
1104+
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
11051105
return false;
11061106
}
11071107

0 commit comments

Comments
 (0)