erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-13 02:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix(android): Sanitize version for API query

Browse source 
Fixes #2298
Sanitize the app version to `#.#.#` to match the API query spec
This commit is contained in:
Darcy Wong 2019-11-08 13:32:35 +07:00
parent f2192c2bfa
commit 7222ca07d7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,8 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
public class CloudRepository {
static public final CloudRepository shared = new CloudRepository();
@ -123,9 +125,18 @@ public class CloudRepository {
{
String deviceType = CloudDataJsonUtil.getDeviceTypeForCloudQuery(aContext);
// Sanitize appVersion to #.#.# to match the API spec
// Regex needs to match the entire string
String appVersion = BuildConfig.VERSION_NAME;
Pattern pattern = Pattern.compile("(\\d+\\.\\d+\\.\\d+).*");
Matcher matcher = pattern.matcher(appVersion);
if (matcher.matches() && matcher.groupCount() >= 1) {
appVersion = matcher.group(1);
}
// Retrieves the cloud-based keyboard catalog in Android's preferred format.
String keyboardURL = String.format("%s?version=%s&device=%s&languageidtype=bcp47",
KMKeyboardDownloaderActivity.kKeymanApiBaseURL, BuildConfig.VERSION_NAME, deviceType);
KMKeyboardDownloaderActivity.kKeymanApiBaseURL, appVersion, deviceType);
//cloudQueries[cloudQueryEntries++] = new CloudApiParam(ApiTarget.Keyboards, keyboardURL, JSONType.Object);
return new CloudApiTypes.CloudApiParam(