oops my latest change busted android connection detection

This commit is contained in:
Kevin Hester 2021-05-03 15:37:37 +08:00
parent d179bda728
commit bc76c79e1e
2 changed files with 10 additions and 9 deletions

View File

@ -27,18 +27,19 @@ PhoneAPI::~PhoneAPI()
void PhoneAPI::handleStartConfig() void PhoneAPI::handleStartConfig()
{ {
// even if we were already connected - restart our state machine // Must be before setting state (because state is how we know !connected)
state = STATE_SEND_MY_INFO;
DEBUG_MSG("Reset nodeinfo read pointer\n");
nodeInfoForPhone = NULL; // Don't keep returning old nodeinfos
nodeDB.resetReadPointer(); // FIXME, this read pointer should be moved out of nodeDB and into this class - because
// this will break once we have multiple instances of PhoneAPI running independently
if (!isConnected()) { if (!isConnected()) {
onConnectionChanged(true); onConnectionChanged(true);
observe(&service.fromNumChanged); observe(&service.fromNumChanged);
} }
// even if we were already connected - restart our state machine
state = STATE_SEND_MY_INFO;
DEBUG_MSG("Starting API client config\n");
nodeInfoForPhone = NULL; // Don't keep returning old nodeinfos
nodeDB.resetReadPointer(); // FIXME, this read pointer should be moved out of nodeDB and into this class - because
// this will break once we have multiple instances of PhoneAPI running independently
} }
void PhoneAPI::close() void PhoneAPI::close()

View File

@ -32,7 +32,7 @@ void BluetoothPhoneAPI::onNowHasData(uint32_t fromRadioNum)
} }
bool BluetoothPhoneAPI::checkIsConnected() { bool BluetoothPhoneAPI::checkIsConnected() {
return curConnectionHandle != -1; return curConnectionHandle >= 0;
} }
int toradio_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) int toradio_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg)