From 27f3736bee0be62a7734ebedb1bbbf83cbe93dc4 Mon Sep 17 00:00:00 2001 From: Randy Boring Date: Wed, 5 Jun 2019 17:41:31 -0500 Subject: [PATCH] define and use the constant InstallableConstants.defaultVersion instead of a magic string --- ios/engine/KMEI/KeymanEngine/Classes/Manager.swift | 2 +- .../Classes/Model/InstallableLexicalModel.swift | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift index 419d456551..e9d5a133f0 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift @@ -1221,7 +1221,7 @@ public class Manager: NSObject, HTTPDownloadDelegate, UIGestureRecognizerDelegat downloadQueue!.userInfo = commonUserData let request = HTTPDownloadRequest(url: lexicalModelURL, userInfo: commonUserData) - request.destinationFile = Storage.active.lexicalModelURL(forID: lexicalModel.id, version: lexicalModel.version ?? "0.1.0").path + request.destinationFile = Storage.active.lexicalModelURL(forID: lexicalModel.id, version: lexicalModel.version ?? InstallableConstants.defaultVersion).path request.tag = 0 downloadQueue!.addRequest(request) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Model/InstallableLexicalModel.swift b/ios/engine/KMEI/KeymanEngine/Classes/Model/InstallableLexicalModel.swift index 460340c8b9..6786d52d1f 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Model/InstallableLexicalModel.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Model/InstallableLexicalModel.swift @@ -8,6 +8,10 @@ import Foundation +struct InstallableConstants { + static let defaultVersion = "0.1.0" +} + /// Mainly differs from the API `LexicalModel` by having an associated language. public struct InstallableLexicalModel: Codable { public var id: String @@ -38,7 +42,7 @@ public struct InstallableLexicalModel: Codable { self.name = lexicalModel.name self.languageID = languageID // self.languageName = language.name - self.version = lexicalModel.version ?? "0.1.0" + self.version = lexicalModel.version ?? InstallableConstants.defaultVersion self.isCustom = isCustom } }