MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-01 14:32:54 +01:00
Code Releases Wiki Activity

Allow for gatt write request responses

Browse Source 
Allow for support classes to send a write request response to the
device, fi requested. The standard actually expects this to happen, but
Gadgetbridge did not originally support it, so there are concerns that
enabling this globally will cause issues for devices that do not expect
the response.

See also: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2831#issuecomment-941568
This commit is contained in:
José Rebelo 2023-07-24 18:16:23 +01:00
parent a02a6cba14
commit 3b7f4f7238
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
View File

@ -79,6 +79,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
mQueue = new BtLEQueue(getBluetoothAdapter(), getDevice(), this, this, getContext(), mSupportedServerServices); mQueue = new BtLEQueue(getBluetoothAdapter(), getDevice(), this, this, getContext(), mSupportedServerServices);
mQueue.setAutoReconnect(getAutoReconnect()); mQueue.setAutoReconnect(getAutoReconnect());
mQueue.setImplicitGattCallbackModify(getImplicitCallbackModify()); mQueue.setImplicitGattCallbackModify(getImplicitCallbackModify());
mQueue.setSendWriteRequestResponse(getSendWriteRequestResponse());
} }
return mQueue.connect(); return mQueue.connect();
} }
@ -89,6 +90,19 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
} }
} }
/**
* Whether to send a write request response to the device, if requested. The standard actually
* expects this to happen, but Gadgetbridge did not originally support it. This is set to false
* to prevent breaking devices that are somehow not expecting the response.
* <p>
* See also: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2831#issuecomment-941568
*
* @return whether to send write request responses, if a response is requested
*/
public boolean getSendWriteRequestResponse() {
return false;
}
@Override @Override
public void setAutoReconnect(boolean enable) { public void setAutoReconnect(boolean enable) {
super.setAutoReconnect(enable); super.setAutoReconnect(enable);

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
View File

@ -82,6 +82,7 @@ public final class BtLEQueue {
private final InternalGattServerCallback internalGattServerCallback; private final InternalGattServerCallback internalGattServerCallback;
private boolean mAutoReconnect; private boolean mAutoReconnect;
private boolean mImplicitGattCallbackModify = true; private boolean mImplicitGattCallbackModify = true;
private boolean mSendWriteRequestResponse = false;
private Thread dispatchThread = new Thread("Gadgetbridge GATT Dispatcher") { private Thread dispatchThread = new Thread("Gadgetbridge GATT Dispatcher") {
@ -221,6 +222,10 @@ public final class BtLEQueue {
mImplicitGattCallbackModify = enable; mImplicitGattCallbackModify = enable;
} }
public void setSendWriteRequestResponse(final boolean enable) {
mSendWriteRequestResponse = enable;
}
protected boolean isConnected() { protected boolean isConnected() {
return mGbDevice.isConnected(); return mGbDevice.isConnected();
} }
@ -756,8 +761,12 @@ public final class BtLEQueue {
return; return;
} }
LOG.debug("characteristic write request: " + device.getAddress() + " characteristic: " + characteristic.getUuid()); LOG.debug("characteristic write request: " + device.getAddress() + " characteristic: " + characteristic.getUuid());
boolean success = false;
if (getCallbackToUse() != null) { if (getCallbackToUse() != null) {
getCallbackToUse().onCharacteristicWriteRequest(device, requestId, characteristic, preparedWrite, responseNeeded, offset, value); success = getCallbackToUse().onCharacteristicWriteRequest(device, requestId, characteristic, preparedWrite, responseNeeded, offset, value);
}
if (responseNeeded && mSendWriteRequestResponse) {
mBluetoothGattServer.sendResponse(device, requestId, success ? BluetoothGatt.GATT_SUCCESS : BluetoothGatt.GATT_FAILURE, 0, new byte[0]);
} }
} }
@ -778,10 +787,13 @@ public final class BtLEQueue {
return; return;
} }
LOG.debug("onDescriptorWriteRequest: " + device.getAddress()); LOG.debug("onDescriptorWriteRequest: " + device.getAddress());
boolean success = false;
if(getCallbackToUse() != null) { if(getCallbackToUse() != null) {
getCallbackToUse().onDescriptorWriteRequest(device, requestId, descriptor, preparedWrite, responseNeeded, offset, value); success = getCallbackToUse().onDescriptorWriteRequest(device, requestId, descriptor, preparedWrite, responseNeeded, offset, value);
}
if (responseNeeded && mSendWriteRequestResponse) {
mBluetoothGattServer.sendResponse(device, requestId, success ? BluetoothGatt.GATT_SUCCESS : BluetoothGatt.GATT_FAILURE, 0, new byte[0]);
} }
} }
} }
} }