erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-19 20:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2724 from keymanapp/fix/android/cherry/version-api

Browse source 
fix(android): Sanitize app version for api query
This commit is contained in:
Darcy Wong 2020-02-25 13:23:43 +07:00 • committed by GitHub
commit bf68ce7a8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,8 +227,10 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity {
else
{
// Keyman cloud
// Sanitize appVersion to #.#.# to match the API spec
String appVersion = KMManager.getVersion();
String _remoteUrl = String.format("%s/%s/%s?version=%s&device=%s&languageidtype=bcp47",
kKeymanApiBaseURL, langID, kbID, BuildConfig.VERSION_NAME, deviceType);
kKeymanApiBaseURL, langID, kbID, appVersion, deviceType);
cloudQueries.add(
new CloudApiTypes.CloudApiParam(
CloudApiTypes.ApiTarget.Keyboard, _remoteUrl)

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

@ -11,6 +11,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import android.annotation.SuppressLint;
import android.app.Dialog;
@ -224,8 +226,20 @@ public final class KMManager {
return getResourceRoot() + KMDefault_UndefinedPackageID + File.separator;
}
/**
* Extract app version #.#.# from VERSION_NAME
* @return String
*/
public static String getVersion() {
return com.tavultesoft.kmea.BuildConfig.VERSION_NAME;
// Regex needs to match the entire string
String appVersion = com.tavultesoft.kmea.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);
}
return appVersion;
}
// Check if a keyboard namespace is reserved

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

@ -28,8 +28,6 @@ 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();
@ -130,13 +128,7 @@ public class CloudRepository {
// 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);
}
String appVersion = KMManager.getVersion();
// Retrieves the cloud-based keyboard catalog in Android's preferred format.
String keyboardURL = String.format("%s?version=%s&device=%s&languageidtype=bcp47",
KMKeyboardDownloaderActivity.kKeymanApiBaseURL, appVersion, deviceType);