forked from Blendman974/faceclaw
Do pairing-auth at "Checking Firmware" stage
This commit is contained in:
1 parent
049a348627
commit
5c17498a46
2 files changed
+37
-15
No files matched your search
@@ -92,16 +92,35 @@ public class FaceclawDeviceInfoProbe implements FaceclawBleListener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] ack = probeArm(rightAddress, "right");
|
// Pair both arms before asking for versions, even when the right
|
||||||
|
// lens answers immediately and no left-lens fallback is needed.
|
||||||
|
boolean rightAuthenticated = connectAndAuthenticateArm(rightAddress, "right");
|
||||||
|
boolean leftReady = false;
|
||||||
|
boolean leftAuthenticated = false;
|
||||||
|
if (!cancelled && !leftAddress.trim().isEmpty()
|
||||||
|
&& !leftAddress.equalsIgnoreCase(rightAddress)) {
|
||||||
|
try {
|
||||||
|
leftAuthenticated = connectAndAuthenticateArm(leftAddress, "left");
|
||||||
|
leftReady = !cancelled;
|
||||||
|
} catch (Exception e) {
|
||||||
|
emitLog("left-lens connection/auth failed: "
|
||||||
|
+ (e.getMessage() == null ? e.toString() : e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cancelled) {
|
||||||
|
emitError("Cancelled.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] ack = queryArm(rightAddress, "right", rightAuthenticated);
|
||||||
// The right lens is the documented control endpoint, but a silent
|
// The right lens is the documented control endpoint, but a silent
|
||||||
// right lens has been observed on stock 2.2.9 even after a
|
// right lens has been observed on stock 2.2.9 even after a
|
||||||
// successful security auth — run the same probe against the left
|
// successful security auth — run the same probe against the left
|
||||||
// lens rather than giving up, and log which lens answered.
|
// lens rather than giving up, and log which lens answered.
|
||||||
if (ack == null && !cancelled && !leftAddress.trim().isEmpty()
|
if (ack == null && !cancelled && leftReady) {
|
||||||
&& !leftAddress.equalsIgnoreCase(rightAddress)) {
|
|
||||||
emitLog("right lens did not answer the settings query; probing the left lens");
|
emitLog("right lens did not answer the settings query; probing the left lens");
|
||||||
try {
|
try {
|
||||||
ack = probeArm(leftAddress, "left");
|
ack = queryArm(leftAddress, "left", leftAuthenticated);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
emitLog("left-lens probe failed: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
|
emitLog("left-lens probe failed: " + (e.getMessage() == null ? e.toString() : e.getMessage()));
|
||||||
}
|
}
|
||||||
@@ -133,18 +152,11 @@ public class FaceclawDeviceInfoProbe implements FaceclawBleListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private boolean connectAndAuthenticateArm(String address, String label) throws InterruptedException {
|
||||||
* Connect + authenticate + prelude + settings read on one lens. Returns the
|
|
||||||
* settings ack protobuf, an unsolicited settings push that carried firmware
|
|
||||||
* versions, or null when the lens never answered the read. Throws on
|
|
||||||
* connect or prelude failure; the caller wraps the fallback lens's attempt
|
|
||||||
* so its failure cannot mask the primary lens's outcome.
|
|
||||||
*/
|
|
||||||
private byte[] probeArm(String address, String label) throws InterruptedException {
|
|
||||||
emitState("connecting", label);
|
emitState("connecting", label);
|
||||||
connectArm(address);
|
connectArm(address);
|
||||||
if (cancelled) {
|
if (cancelled) {
|
||||||
return null;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Firmware 2.2.9 answers no queries until the security-auth exchange
|
// Firmware 2.2.9 answers no queries until the security-auth exchange
|
||||||
@@ -154,7 +166,17 @@ public class FaceclawDeviceInfoProbe implements FaceclawBleListener {
|
|||||||
// against the custom firmware, whose response to the exchange is not
|
// against the custom firmware, whose response to the exchange is not
|
||||||
// yet hardware-verified, so an unconfirmed auth falls through.
|
// yet hardware-verified, so an unconfirmed auth falls through.
|
||||||
emitState("authenticating", label);
|
emitState("authenticating", label);
|
||||||
boolean authenticated = authenticate(address);
|
return authenticate(address);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prelude + settings read on an already connected/authenticated lens.
|
||||||
|
* Returns the settings ack protobuf, an unsolicited settings push that
|
||||||
|
* carried firmware versions, or null when the lens never answered the read.
|
||||||
|
* Throws on prelude failure; the caller wraps the fallback lens's attempt
|
||||||
|
* so its failure cannot mask the primary lens's outcome.
|
||||||
|
*/
|
||||||
|
private byte[] queryArm(String address, String label, boolean authenticated) throws InterruptedException {
|
||||||
if (cancelled) {
|
if (cancelled) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ package com.faceclaw.app;
|
|||||||
public interface FaceclawDeviceInfoProbeListener {
|
public interface FaceclawDeviceInfoProbeListener {
|
||||||
void onLog(String line);
|
void onLog(String line);
|
||||||
|
|
||||||
/** Lifecycle: connecting, querying. */
|
/** Lifecycle: connecting/authenticating for each arm, then querying. */
|
||||||
void onState(String state, String detail);
|
void onState(String state, String detail);
|
||||||
|
|
||||||
/** Terminal success: firmware versions and the firmware-extension string (empty on stock). */
|
/** Terminal success: firmware versions and the firmware-extension string (empty on stock). */
|
||||||
|
|||||||
Reference in new issue
Block a user