erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-09 18:35:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #441 from keymanapp/android-370-dont-install-0b-keyboard

Browse source 
Ignore zero-byte JS keyboard files
This commit is contained in:
Darcy Wong 2017-11-23 13:15:55 +07:00 • committed by GitHub
commit ac915f7569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java
View file

@ -44,6 +44,7 @@ import android.widget.GridLayout;
import android.widget.PopupWindow;
import android.widget.PopupWindow.OnDismissListener;
import android.widget.TextView;
import android.widget.Toast;
final class KMKeyboard extends WebView {
private final Context context;
@ -236,6 +237,7 @@ final class KMKeyboard extends WebView {
boolean retVal = true;
String keyboardVersion = KMManager.getLatestKeyboardFileVersion(getContext(), keyboardID);
if (!KMManager.shouldAllowSetKeyboard() || keyboardVersion == null) {
Toast.makeText(context, "Invalid keyboard! Loading default", Toast.LENGTH_LONG).show();
keyboardID = KMManager.KMDefault_KeyboardID;
languageID = KMManager.KMDefault_LanguageID;
retVal = false;
@ -323,6 +325,7 @@ final class KMKeyboard extends WebView {
boolean retVal = true;
String keyboardVersion = KMManager.getLatestKeyboardFileVersion(getContext(), keyboardID);
if (!KMManager.shouldAllowSetKeyboard() || keyboardVersion == null) {
Toast.makeText(context, "Invalid keyboard! Loading default", Toast.LENGTH_LONG).show();
keyboardID = KMManager.KMDefault_KeyboardID;
languageID = KMManager.KMDefault_LanguageID;
keyboardName = KMManager.KMDefault_KeyboardName;

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

@ -472,7 +472,7 @@ public final class KMManager {
String langID = kbInfo.get(KMKey_LanguageID);
String kbVersion = kbInfo.get(KMManager.KMKey_KeyboardVersion);
String latestKbVersion = getLatestKeyboardFileVersion(context, kbID);
if (kbVersion == null || !kbVersion.equals(latestKbVersion)) {
if ((latestKbVersion != null) && (kbVersion == null || !kbVersion.equals(latestKbVersion))) {
kbInfo.put(KMManager.KMKey_KeyboardVersion, latestKbVersion);
kbList.set(i, kbInfo);
shouldUpdateList = true;
@ -1456,8 +1456,10 @@ public final class KMManager {
return kbFileVersion;
for (String file : files) {
if (!file.endsWith(".js"))
// Ensure keyboard file is JS and non-zero size
if (!file.endsWith(".js") || new File(path + file).length() == 0) {
continue;
}
String base = String.format("%s-", keyboardID);
int index = file.indexOf(base);