Skip to content

fix: comprehensive React Native 0.80.0+ compatibility fix #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: comprehensive React Native 0.80.0+ compatibility fix #1312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions android/src/main/java/com/bleplx/BlePlxModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public void onSuccess(Void data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -187,7 +187,7 @@ public void onSuccess(Void data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand Down Expand Up @@ -273,7 +273,7 @@ public void onSuccess(Device[] data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -296,7 +296,7 @@ public void onSuccess(Device[] data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -318,7 +318,7 @@ public void onSuccess(Device data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -338,7 +338,7 @@ public void onSuccess(Device data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -358,7 +358,7 @@ public void onSuccess(Device data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand Down Expand Up @@ -422,7 +422,7 @@ public void onEvent(ConnectionState connectionState) {
new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -442,7 +442,7 @@ public void onSuccess(Device data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -461,7 +461,7 @@ public void onSuccess(Boolean isConnected) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -483,7 +483,7 @@ public void onSuccess(Device data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -503,7 +503,7 @@ public void servicesForDevice(final String deviceId, final Promise promise) {
}
promise.resolve(jsArray);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}

}
Expand All @@ -524,7 +524,7 @@ public void characteristicsForDevice(final String deviceId,
}
promise.resolve(jsCharacteristics);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

Expand All @@ -541,7 +541,7 @@ public void characteristicsForService(final int serviceIdentifier, final Promise
}
promise.resolve(jsCharacteristics);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

Expand All @@ -561,7 +561,7 @@ public void descriptorsForDevice(final String deviceIdentifier,
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

Expand All @@ -580,7 +580,7 @@ public void descriptorsForService(final int serviceIdentifier,
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

Expand All @@ -598,7 +598,7 @@ public void descriptorsForCharacteristic(final int characteristicIdentifier,
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
promise.reject(null, errorConverter.toJs(error));
promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

Expand Down Expand Up @@ -627,7 +627,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand All @@ -654,7 +654,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand All @@ -680,7 +680,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
Expand All @@ -706,7 +706,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand All @@ -732,7 +732,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand All @@ -757,7 +757,7 @@ public void onSuccess(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand Down Expand Up @@ -788,7 +788,7 @@ public void onEvent(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand Down Expand Up @@ -818,7 +818,7 @@ public void onEvent(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand Down Expand Up @@ -848,7 +848,7 @@ public void onEvent(Characteristic data) {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
safePromise.reject(null, errorConverter.toJs(error));
safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
Expand Down Expand Up @@ -878,7 +878,7 @@ public void onSuccess(Descriptor descriptor) {
}, new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
Expand Down Expand Up @@ -906,7 +906,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
Expand All @@ -932,7 +932,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
Expand All @@ -956,7 +956,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
Expand Down Expand Up @@ -988,7 +988,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
Expand Down Expand Up @@ -1019,7 +1019,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
Expand Down Expand Up @@ -1048,7 +1048,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
Expand All @@ -1075,7 +1075,7 @@ public void onSuccess(Descriptor descriptor) {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
Expand All @@ -1101,7 +1101,7 @@ private boolean isRequestPossibleHandler(String functionName, final Promise prom
if(this.bleAdapter == null){
BleError bleError = new BleError(BleErrorCode.BluetoothManagerDestroyed, String.format("BleManager cannot call the %s function because BleManager has been destroyed", functionName), null);

promise.reject(null, errorConverter.toJs(bleError));
promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
return false;
}

Expand Down