Merge branch 'jens/bugfixes-1.8'

Yubico · Nov 5, 2024 · d859d5a · d859d5a
2 parents 5ee0413 + 182d0db
commit d859d5a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/Authenticator/Localizable.xcstrings b/Authenticator/Localizable.xcstrings
@@ -1063,7 +1063,24 @@
         }
       }
     },
+    "FIDO management over USB-C is not supported by iOS. Use NFC or the desktop Yubico Authenticator instead." : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "La gestion FIDO via USB-C n'est pas prise en charge par iOS. Utilisez plutôt la NFC ou Yubico Authenticator."
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "USB-C経由のFIDO管理はiOSではサポートされていません。代わりにNFCまたはデスクトップのYubico Authenticatorをご利用ください。"
+          }
+        }
+      }
+    },
     "FIDO over USB-C is not supported by iOS. Use NFC or the desktop Yubico Authenticator instead." : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -3004,6 +3021,22 @@
         }
       }
     },
+    "The YubiKey has no more storage for OATH accounts." : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "La clé YubiKey n'a plus d'espace de stockage pour les comptes OATH."
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "YubiKeyにはもうOATHアカウント用のストレージはない。"
+          }
+        }
+      }
+    },
     "There's already an account named" : {
       "comment" : "OATH substring in 'There's already an account named [issuer, name] on this YubiKey.",
       "localizations" : {

diff --git a/Authenticator/Model/FIDOPINViewModel.swift b/Authenticator/Model/FIDOPINViewModel.swift
@@ -23,7 +23,7 @@ enum FidoViewModelError: Error, LocalizedError {
         case .pinsDoNotMatch:
             return String(localized: "PINs don't match")
         case .usbNotSupported:
-            return String(localized: "FIDO over USB-C is not supported by iOS. Use NFC or the desktop Yubico Authenticator instead.")
+            return String(localized: "FIDO management over USB-C is not supported by iOS. Use NFC or the desktop Yubico Authenticator instead.")
         case .timeout:
             return String(localized: "Operation timed out.")
         case .locked:

diff --git a/Authenticator/Model/FIDOResetViewModel.swift b/Authenticator/Model/FIDOResetViewModel.swift
@@ -122,7 +122,7 @@ extension FIDOResetViewModel {
             guard let session else { self.state = .error(error!); return }
 
             let version = session.version
-            guard version != YKFVersion(string: "5.7.2") else {
+            guard version < YKFVersion(string: "5.7.0") || version > YKFVersion(string: "5.7.2") else {
                 DispatchQueue.main.async {
                     self.state = .error(FidoViewModelError.notSupportedOverLightning)
                 }