squash later: change if clause to check AtLeast(9,2,0) and remove

inferVersionAndProduct.

also correct the status to connected and NOT initialized

Author: NicolaLS

api/firmware/device.go

@@ -232,18 +232,6 @@ func (device *Device) Version() *semver.SemVer {
 	return device.version
 }
 
-// inferVersionAndProduct either sets the version and product by using REQ_INFO if they were not
-// provided. In this case, the firmware is assumed to be >=v4.3.0, before that REQ_INFO was not
-// available.
-func (device *Device) inferVersionAndProduct(version *semver.SemVer, product common.Product) {
-	// The version has not been provided, so we try to get it from REQ_INFO.
-	if device.version == nil {
-		device.log.Info(fmt.Sprintf("REQ_INFO: version=%s, product=%s", version, product))
-		device.version = version
-		device.product = &product
-	}
-}
-
 // Init initializes the device. It changes the status to StatusRequireAppUpgrade if needed,
 // otherwise performs the attestation check, unlock, and noise pairing. This call is blocking.
 // After this call finishes, Status() will be either:
@@ -259,17 +247,24 @@ func (device *Device) Init() error {
 	device.sendCipher = nil
 	device.receiveCipher = nil
 
-	if device.version == nil || device.version.AtLeast(semver.NewSemVer(4, 3, 0)) {
+	if device.version == nil || device.version.AtLeast(semver.NewSemVer(9, 2, 0)) {
 		deviceInfo, err := device.info()
 		if err != nil {
 			return errp.New(
 				"REQ_INFO unavailable; need to provide version and product via the USB HID descriptor")
 		}
-		// Does nothing if device.version == nil
-		device.inferVersionAndProduct(deviceInfo.version, deviceInfo.product)
-
-		if deviceInfo.unlocked || (deviceInfo.initialized != nil && *deviceInfo.initialized) {
+		device.log.Info(fmt.Sprintf("REQ_INFO: version=%s, product=%s", deviceInfo.version,
+			deviceInfo.product))
+		device.version = deviceInfo.version
+		device.product = &deviceInfo.product
+
+		if !deviceInfo.version.AtLeast(semver.NewSemVer(9, 20, 0)) {
+			device.changeStatus(StatusConnected)
+		} else if deviceInfo.unlocked {
 			device.changeStatus(StatusInitialized)
+		} else if *deviceInfo.initialized {
+			// deviceInfo.initialized is not nil if version is at least 9.20.0.
+			device.changeStatus(StatusConnected)
 		} else {
 			device.changeStatus(StatusUninitialized)
 		}

api/firmware/status.go

@@ -39,7 +39,8 @@ const (
 	// device. Use CreateBackup() to move to StatusInitialized.
 	StatusSeeded Status = "seeded"
 
-	// StatusInitialized means the device is seeded and the backup was created.
+	// StatusInitialized means the device is seeded and the backup was created, and the device is
+	// unlocked. The keystore is ready to use.
 	StatusInitialized Status = "initialized"
 
 	// StatusRequireFirmwareUpgrade means that the a firmware upgrade is required before being able