From 7cfaf7bec062ea92936708dfa47df6d0ea71b4a5 Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Thu, 7 May 2020 16:04:45 +0700
Subject: [PATCH] fix(ios/oem): adjusts to unexpected keyboard metadata shift
 for languages

---
 oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift | 2 +-
 oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift   | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift b/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
index 39dbe4a0ea..fc16b60711 100644
--- a/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
+++ b/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
@@ -229,7 +229,7 @@ class FVRegionStorage {
 
           let keyboard: InstallableKeyboard = InstallableKeyboard.init(id: kb.id,
                                                                        name: kb.name,
-                                                                       languageID: keyboardInfo.languages.keys[keyboardInfo.languages.startIndex],
+                                                                       languageID: keyboardInfo.languages[keyboardInfo.languages.startIndex],
                                                                        languageName: kb.name,
                                                                        version: keyboardInfo.version,
                                                                        isRTL: false,
diff --git a/oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift b/oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift
index 5df939c6be..1a0a27d642 100644
--- a/oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift
+++ b/oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift
@@ -17,17 +17,12 @@ import Foundation
 // display and install the keyboard into Keyman Engine. Most of the data
 // in the files is ignored.
 //
-struct KeyboardInfoLanguage: Decodable {
-  let displayName: String
-  let languageName: String
-  let scriptName: String
-}
 
 struct KeyboardInfo: Decodable {
   let id: String
   let version: String
   let name: String
-  let languages: [String:KeyboardInfoLanguage]
+  let languages: [String]
 }
 
 class KeyboardInfoParser {