rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#129 fixed: improved characteristic validation

This commit is contained in:
Aleksander Nowakowski 2018-10-16 15:44:39 +02:00
parent 92fd8d647c
commit 31bf36350a
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dfu/src/main/java/no/nordicsemi/android/dfu/ButtonlessDfuWithBondSharingImpl.java
View File

@ -60,8 +60,11 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException;
final BluetoothGattService dfuService = gatt.getService(BUTTONLESS_DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(BUTTONLESS_DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mButtonlessDfuCharacteristic = dfuService.getCharacteristic(BUTTONLESS_DFU_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(BUTTONLESS_DFU_UUID);
return mButtonlessDfuCharacteristic != null; if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false;
mButtonlessDfuCharacteristic = characteristic;
return true;
} }
@Override @Override

7
dfu/src/main/java/no/nordicsemi/android/dfu/ButtonlessDfuWithoutBondSharingImpl.java
View File

@ -69,8 +69,11 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException;
final BluetoothGattService dfuService = gatt.getService(BUTTONLESS_DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(BUTTONLESS_DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mButtonlessDfuCharacteristic = dfuService.getCharacteristic(BUTTONLESS_DFU_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(BUTTONLESS_DFU_UUID);
return mButtonlessDfuCharacteristic != null; if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false;
mButtonlessDfuCharacteristic = characteristic;
return true;
} }
@Override @Override

7
dfu/src/main/java/no/nordicsemi/android/dfu/ExperimentalButtonlessDfuImpl.java
View File

@ -59,8 +59,11 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException;
final BluetoothGattService dfuService = gatt.getService(EXPERIMENTAL_BUTTONLESS_DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(EXPERIMENTAL_BUTTONLESS_DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mButtonlessDfuCharacteristic = dfuService.getCharacteristic(EXPERIMENTAL_BUTTONLESS_DFU_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(EXPERIMENTAL_BUTTONLESS_DFU_UUID);
return mButtonlessDfuCharacteristic != null; if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false;
mButtonlessDfuCharacteristic = characteristic;
return true;
} }
@Override @Override

5
dfu/src/main/java/no/nordicsemi/android/dfu/LegacyButtonlessDfuImpl.java
View File

@ -58,9 +58,10 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException;
final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mControlPointCharacteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID);
if (mControlPointCharacteristic == null) if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false; return false;
mControlPointCharacteristic = characteristic;
mProgressInfo.setProgress(DfuBaseService.PROGRESS_STARTING); mProgressInfo.setProgress(DfuBaseService.PROGRESS_STARTING);

7
dfu/src/main/java/no/nordicsemi/android/dfu/LegacyDfuImpl.java
View File

@ -132,9 +132,12 @@ import no.nordicsemi.android.error.LegacyDfuError;
final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mControlPointCharacteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID);
if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false;
mControlPointCharacteristic = characteristic;
mPacketCharacteristic = dfuService.getCharacteristic(DFU_PACKET_UUID); mPacketCharacteristic = dfuService.getCharacteristic(DFU_PACKET_UUID);
return mControlPointCharacteristic != null && mPacketCharacteristic != null; return mPacketCharacteristic != null;
} }
@Override @Override

7
dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java
View File

@ -148,9 +148,12 @@ import no.nordicsemi.android.error.SecureDfuError;
final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID); final BluetoothGattService dfuService = gatt.getService(DFU_SERVICE_UUID);
if (dfuService == null) if (dfuService == null)
return false; return false;
mControlPointCharacteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID); final BluetoothGattCharacteristic characteristic = dfuService.getCharacteristic(DFU_CONTROL_POINT_UUID);
if (characteristic == null || characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG) == null)
return false;
mControlPointCharacteristic = characteristic;
mPacketCharacteristic = dfuService.getCharacteristic(DFU_PACKET_UUID); mPacketCharacteristic = dfuService.getCharacteristic(DFU_PACKET_UUID);
return mControlPointCharacteristic != null && mPacketCharacteristic != null; return mPacketCharacteristic != null;
} }
@Override @Override