aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-22 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopting to BLE lib changes, part 1

Browse Source
This commit is contained in:
Aleksander Nowakowski
2018-04-13 08:53:37 +02:00
parent 27c491f633
commit 0627f29ec9
7 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java
View File

@@ -307,6 +307,11 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl
showToast(R.string.bonded);
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
showToast(R.string.bonding_failed);
}
@Override
public boolean shouldEnableBatteryLevelNotifications(final BluetoothDevice device) {
// Yes, we want battery level updates

5
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java
View File

@@ -307,6 +307,11 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct
showToast(R.string.bonded);
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
showToast(R.string.bonding_failed);
}
@Override
public boolean shouldEnableBatteryLevelNotifications(final BluetoothDevice device) {
// Yes, we want battery level updates

12
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java
View File

@@ -268,7 +268,7 @@ public abstract class BleProfileService extends Service implements BleManagerCal
// When we are connected, but the application is not open, we are not really interested in battery level notifications. But we will still be receiving other values, if enabled.
if (!mActivityIsChangingConfiguration && mBleManager.isConnected())
mBleManager.setBatteryNotifications(false);
mBleManager.disableBatteryLevelNotifications();
// We want the onRebind method be called if anything else binds to it again
return true;
@@ -518,6 +518,16 @@ public abstract class BleProfileService extends Service implements BleManagerCal
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
showToast(no.nordicsemi.android.nrftoolbox.common.R.string.bonding_failed);
final Intent broadcast = new Intent(BROADCAST_BOND_STATE);
broadcast.putExtra(EXTRA_DEVICE, mBluetoothDevice);
broadcast.putExtra(EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
@Override
public void onError(final BluetoothDevice device, final String message, final int errorCode) {
final Intent broadcast = new Intent(BROADCAST_ERROR);

5
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java
View File

@@ -548,6 +548,11 @@ public abstract class BleProfileServiceReadyActivity<E extends BleProfileService
// empty default implementation
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
// empty default implementation
}
@Override
public final boolean shouldEnableBatteryLevelNotifications(final BluetoothDevice device) {
// This method will never be called.

12
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java
View File

@@ -286,7 +286,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
// But we will still be receiving other values, if enabled.
for (final BleManager<BleManagerCallbacks> manager : mBleManagers.values()) {
if (manager.isConnected())
manager.setBatteryNotifications(false);
manager.disableBatteryLevelNotifications();
}
} else {
// The last activity has disconnected from the service and there are no devices to manage. The service may be stopped.
@@ -535,6 +535,16 @@ public abstract class BleMulticonnectProfileService extends Service implements B
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
showToast(no.nordicsemi.android.nrftoolbox.common.R.string.bonding_failed);
final Intent broadcast = new Intent(BROADCAST_BOND_STATE);
broadcast.putExtra(EXTRA_DEVICE, device);
broadcast.putExtra(EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
@Override
public void onError(final BluetoothDevice device, final String message, final int errorCode) {
final Intent broadcast = new Intent(BROADCAST_ERROR);

5
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java
View File

@@ -437,6 +437,11 @@ public abstract class BleMulticonnectProfileServiceReadyActivity<E extends BleMu
// empty default implementation
}
@Override
public void onBondingFailed(final BluetoothDevice device) {
// empty default implementation
}
@Override
public void onDeviceNotSupported(final BluetoothDevice device) {
showToast(R.string.not_supported);

1
common/src/main/res/values/strings.xml
View File

@@ -23,6 +23,7 @@
<resources>
<string name="bonding">Bonding with the device&#8230;</string>
<string name="bonded">The device is now bonded.</string>
<string name="bonding_failed">Bonding failed.</string>
<string name="channel_connected_devices_title">Background connections</string>
<string name="channel_connected_devices_description">Shows a notification when a device is connected in background.</string>