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

fix(android/engine): Check asset package version before installing

Browse source 
Fixes #3500

When KMManager is copying asset kmp files, check if the asset package is a downgrade before installing it.
This commit is contained in:
Darcy Wong 2020-08-26 14:13:02 +07:00
parent 49e5edd9ff
commit 47fab2d3a2
2 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMManager.java
View file

@ -602,27 +602,49 @@ public final class KMManager {
}
}
// Copy and install all KMP files (Issue for FV app?)
File resourceRoot = new File(getResourceRoot());
PackageProcessor kmpProcessor = new PackageProcessor(resourceRoot);
LexicalModelPackageProcessor lmkmpProcessor = new LexicalModelPackageProcessor(resourceRoot);
String assetFiles[] = assetManager.list("");
for (String assetFile : assetFiles) {
File kmpFile, tempPackagePath;
boolean installAsset = FileUtils.hasKeymanPackageExtension(assetFile) ||
boolean isPackageFile = FileUtils.hasKeymanPackageExtension(assetFile) ||
FileUtils.hasLexicalModelPackageExtension(assetFile);
if (installAsset) {
// Copy asset KMP files
if (isPackageFile) {
copyAsset(context, assetFile, "", true);
kmpFile = new File(getResourceRoot(), assetFile);
tempPackagePath = kmpProcessor.unzipKMP(kmpFile);
if (FileUtils.hasLexicalModelPackageExtension(assetFile)) {
lmkmpProcessor.processKMP(kmpFile, tempPackagePath, PackageProcessor.PP_LEXICAL_MODELS_KEY);
} else {
// Not using the list of entries returned from processKMP()
// because the main App will add the keyboard/lexical model info
kmpProcessor.processKMP(kmpFile, tempPackagePath, PackageProcessor.PP_KEYBOARDS_KEY);
// Determine package info
JSONObject pkgInfo = kmpProcessor.loadPackageInfo(tempPackagePath);
if (pkgInfo == null) {
KMLog.LogError(TAG, "Invalid kmp.json in default asset " + assetFile);
}
String assetPackageID = kmpProcessor.getPackageID(kmpFile);
String assetPackageTarget = kmpProcessor.getPackageTarget(pkgInfo);
// Only install if asset package is not a downgrade
try {
if (assetPackageTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) {
if (!kmpProcessor.isDowngrade(kmpFile, true)) {
// Not using the list of entries returned from processKMP()
// because the main App will add the keyboard/lexical model info
kmpProcessor.processKMP(kmpFile, tempPackagePath, PackageProcessor.PP_KEYBOARDS_KEY);
}
} else if (assetPackageTarget.equals(PackageProcessor.PP_TARGET_LEXICAL_MODELS)) {
if (!lmkmpProcessor.isDowngrade(kmpFile)) {
lmkmpProcessor.processKMP(kmpFile, tempPackagePath, PackageProcessor.PP_LEXICAL_MODELS_KEY);
}
}
} catch (JSONException e) {
KMLog.LogException(TAG, "Unable to determine isDowngrade for " + kmpFile.toString(), e);
}
// Cleanup tempPackagePath
if (tempPackagePath.exists()) {
FileUtils.deleteDirectory(tempPackagePath);
}
}
}

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

@ -428,14 +428,14 @@ public class PackageProcessor {
}
/**
* Determines if installing the .kmp would result in a downgrade. For testing only.
* Determines if installing the .kmp would result in a downgrade.
* @param kmpPath The path to the .kmp to be installed.
* @param preExtracted Indicates use of a temporary testing 'kmp' that is pre-extracted.
* @return <code><b>true</b></code> if installing would be a downgrade, otherwise <code><b>false</b></code>.
* @throws IOException
* @throws JSONException
*/
boolean isDowngrade(File kmpPath, boolean preExtracted) throws IOException, JSONException {
public boolean isDowngrade(File kmpPath, boolean preExtracted) throws IOException, JSONException {
return internalCompareKMPVersion(kmpPath, preExtracted,-1);
}