From 90704d01e77fb4695b4325bfa1a42e131bba2878 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 22 Nov 2022 07:23:58 +0700
Subject: [PATCH] fix(android/engine): Add null check on kmp filename

---
 .../java/com/tavultesoft/kmea/cloud/CloudDataJsonUtil.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtil.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtil.java
index 7086db2348..f6ec11e7ed 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtil.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/cloud/CloudDataJsonUtil.java
@@ -153,9 +153,11 @@ public class CloudDataJsonUtil {
             for (int i = 0; i < KeyboardController.getInstance().get().size(); i++) {
               Keyboard kbd = KeyboardController.getInstance().getKeyboardInfo(i);
               String version = kbd.getVersion();
+              String updateKMP = kbd.getUpdateKMP();
               if (keyboardID.equalsIgnoreCase(kbd.getKeyboardID()) &&
-                  (FileUtils.compareVersions(cloudVersion, version) == FileUtils.VERSION_GREATER) &&
-                  (!kbd.getUpdateKMP().equalsIgnoreCase(cloudKMP))) {
+                  FileUtils.compareVersions(cloudVersion, version) == FileUtils.VERSION_GREATER &&
+                  updateKMP != null &&
+                  updateKMP.equalsIgnoreCase(cloudKMP)) {
                 // Update keyboard with the latest KMP link
                 kbd.setUpdateKMP(cloudKMP);
                 KeyboardController.getInstance().add(kbd);