Skip to content
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.

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

chore: update package dependencies #1089

Merged
merged 29 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
929e0bf
Add example app
dimninik Sep 5, 2023
d328857
WIP: fix updated package
dimninik Sep 6, 2023
2c0a21d
Update native bridge
dimninik Sep 8, 2023
40d296a
fix: package configs
dimninik Sep 8, 2023
bca38dc
feat: add test suite
dimninik Sep 12, 2023
6f9d221
fix: use next version of multiplatform ble adapter with RxAndroidBle2
gmiszewski-intent Sep 12, 2023
4bfdce7
improve issues templates
kacper-cyra Sep 13, 2023
79b1d2d
feat: add test suite
dimninik Sep 12, 2023
688954f
Merge branch 'chore/Update-package-dependencies' of https://github.co…
dimninik Sep 14, 2023
4993227
fix: merge issue
dimninik Sep 14, 2023
e747204
chore: update repo changelog, types and configs
kacper-cyra Sep 15, 2023
98d12e7
Merge branch 'chore/Update-package-dependencies' into chore/add_impro…
kacper-cyra Sep 15, 2023
c531456
chore: change BleATTErrorCode to BleIOSErrorCode in index.d.ts
kacper-cyra Sep 15, 2023
984e22c
fix: update enable disable function info
dimninik Sep 15, 2023
c610878
chore: update config changes
dimninik Sep 19, 2023
b2b8b21
fix: linting
dimninik Sep 20, 2023
437576f
Merge branch 'chore/Update-package-dependencies' into chore/add_impro…
intent-kacper-cyranowski Sep 25, 2023
daa90a9
Merge pull request #1084 from dotintent/chore/add_improvements_to_rep…
intent-kacper-cyranowski Sep 25, 2023
f653fc4
feat: example eslint config
dimninik Sep 25, 2023
c9e6037
ci: add ci/cd testing script
kacper-cyra Sep 25, 2023
3f87c3c
ci: change how paths are build
kacper-cyra Sep 25, 2023
279a91f
Merge pull request #1087 from dotintent/improvement/add_app_building_…
intent-kacper-cyranowski Sep 25, 2023
ba38bb8
fix: docs generator
dimninik Sep 25, 2023
bb37438
Merge branch 'chore/Update-package-dependencies' of https://github.co…
dimninik Sep 25, 2023
0fb20b1
ci: change github workflow trigger branch to master
kacper-cyra Sep 25, 2023
bd92df0
Multiplatformadapter 0.2.0
KamilNatonek Sep 27, 2023
7d23517
chore: docs update
dimninik Sep 28, 2023
9c05d74
Merge branch 'chore/Update-package-dependencies' of https://github.co…
dimninik Sep 28, 2023
653c0c9
fix: example code refactor, changelog styling
dimninik Sep 28, 2023
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
Prev Previous commit
Next Next commit
chore: update config changes
  • Loading branch information
dimninik committed Sep 19, 2023
commit c610878a3843147444c939ed2a1c6d6da00558c0
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ yarn-error.log
buck-out/
\.buckd/
*.keystore
!example/android/app/debug.keystore
intent-kacper-cyranowski marked this conversation as resolved.
Show resolved Hide resolved

# fastlane
#
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ dependencies {
// For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation 'com.github.dotintent:MultiPlatformBleAdapter:ae58b48b0f'
implementation 'com.github.dotintent:MultiPlatformBleAdapter:f801a837fc'
}

if (isNewArchitectureEnabled()) {
Expand Down
8 changes: 7 additions & 1 deletion android/src/main/java/com/bleplx/BlePlxModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import android.app.Activity;

@ReactModule(name = BlePlxModule.NAME)
public class BlePlxModule extends ReactContextBaseJavaModule {
public static final String NAME = "BlePlx";
Expand Down Expand Up @@ -82,7 +84,11 @@ public Map<String, Object> getConstants() {

@ReactMethod
public void createClient(String restoreStateIdentifier) {
bleAdapter = BleAdapterFactory.getNewAdapter(getReactApplicationContext());
final Activity activity = getCurrentActivity();
if (activity == null) {
return;
}
bleAdapter = BleAdapterFactory.getNewAdapter(activity);
bleAdapter.createClient(restoreStateIdentifier,
new OnEventCallback<String>() {
@Override
Expand Down
Binary file added example/android/app/debug.keystore
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,12 @@ export const DevicenRFTestScreen = ({}: DevicenRFTestScreenProps) => {
BLEService.connectToDevice(device.id)
.then(() => BLEService.cancelDeviceConnection())
.then(() => resolve())
.catch(reject)
.catch(error => {
if (error?.message === `Device ${device.id} was disconnected`) {
resolve()
}
reject(error)
})
}
},
[deviceTimeService]
Expand Down