erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-22 08:17:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #2242 from keymanapp/android-lm-version-key

Browse source 
[Android][Stable] Also use the lexical model package version for generating Dataset
This commit is contained in:
Darcy Wong 2019-10-25 14:02:21 +07:00 • committed by GitHub
commit 5ddbf4aa48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/KMEA/app/src/main/java/com/tavultesoft/kmea/data/CloudRepository.java
View file

@ -438,11 +438,11 @@ public class CloudRepository {
langName = languageObj.getString("name");
}
String modelID = model.getString("id");
String modelName = model.getString("name");
String modelVersion = model.getString("version");
String modelID = model.getString(KMManager.KMKey_ID);
String modelName = model.getString(KMManager.KMKey_Name);
String modelVersion = model.getString(KMManager.KMKey_LexicalModelVersion);
String isCustom = model.optString("CustomModel", "N");
String isCustom = model.optString(KMManager.KMKey_CustomModel, "N");
String icon = "0";
HashMap<String, String> hashMap = new HashMap<String, String>();

6
android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/JSONUtils.java
View file

@ -208,6 +208,7 @@ public class JSONUtils {
try {
String packageID = pkg.getName();
JSONObject kmp = parser.getJSONObjectFromFile(file);
String packageVersion = PackageProcessor.getPackageVersion(kmp);
JSONArray kmpModels = kmp.getJSONArray("lexicalModels");
// Determine if kmp contains welcome.htm help file
@ -218,7 +219,6 @@ public class JSONUtils {
JSONObject kmpModelObj = kmpModels.getJSONObject(i);
String modelName = kmpModelObj.getString(KMManager.KMKey_Name);
String modelID = kmpModelObj.getString(KMManager.KMKey_ID);
String modelVersion = kmpModelObj.getString("version");
String modelFilename = pkg.getName() + "/" + modelID + FileUtils.LEXICALMODEL;
// Merge languages
@ -230,10 +230,10 @@ public class JSONUtils {
JSONObject modelObj = new JSONObject();
modelObj.put(KMManager.KMKey_PackageID, packageID);
modelObj.put("id", modelID);
modelObj.put(KMManager.KMKey_ID, modelID);
modelObj.put(KMManager.KMKey_Name, modelName);
modelObj.put("filename", modelFilename);
modelObj.put(KMManager.KMKey_KeyboardVersion, modelVersion);
modelObj.put(KMManager.KMKey_LexicalModelVersion, packageVersion);
modelObj.put(KMManager.KMKey_CustomModel, "Y");
if (containsHelp) {
File welcomeFile = new File(pkg, "welcome.htm");

2
android/KMEA/app/src/main/java/com/tavultesoft/kmea/packages/PackageProcessor.java
View file

@ -215,7 +215,7 @@ public class PackageProcessor {
* @param json The metadata JSONObject for the package.
* @return The version number (via String)
*/
public String getPackageVersion(JSONObject json) {
public static String getPackageVersion(JSONObject json) {
try {
return json.getJSONObject("info").getJSONObject("version").getString("description");
} catch (Exception e) {

4
android/history.md
View file

@ -3,6 +3,10 @@
## 13.0 alpha
* Start version 13.0
## 2019-10-25 12.0.4205 stable
* Bug fix:
* Use lexical model package version for dataset (#2242)
## 2019-10-14 12.0.4204 stable
* Bug Fix:
* FirstVoices app may crash if analytics is not present (#2204)