Skip to content

Commit 7a05d54

Browse files
committed
Merge branch 'bugfix/transport-type-validation' into 'master'
Supported device type validation See merge request idf/esp-idf-provisioning-android!35
2 parents 094edda + f965205 commit 7a05d54

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

app/src/main/java/com/espressif/ui/activities/AddDeviceActivity.java

+4
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,17 @@ public void deviceDetected(ESPDevice device) {
373373

374374
Toast.makeText(AddDeviceActivity.this, "Error! Device not supported", Toast.LENGTH_LONG).show();
375375
finish();
376+
} else {
377+
device.connectToDevice();
376378
}
377379
} else if (deviceType.equals(AppConstants.DEVICE_TYPE_SOFTAP)) {
378380

379381
if (espDevice != null && espDevice.getTransportType().equals(ESPConstants.TransportType.TRANSPORT_BLE)) {
380382

381383
Toast.makeText(AddDeviceActivity.this, "Error! Device not supported", Toast.LENGTH_LONG).show();
382384
finish();
385+
} else {
386+
device.connectToDevice();
383387
}
384388
} else {
385389
device.connectToDevice();

app/src/main/java/com/espressif/ui/activities/ProvisionActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ private void initViews() {
113113

114114
btnOk = findViewById(R.id.btn_ok);
115115
txtOkBtn = findViewById(R.id.text_btn);
116+
btnOk.findViewById(R.id.iv_arrow).setVisibility(View.GONE);
116117

117118
txtOkBtn.setText(R.string.btn_ok);
118119
btnOk.setOnClickListener(okBtnClickListener);

0 commit comments

Comments
 (0)