From 56982bde4e96e8ba2fde4e75a34a5fa90a8a301f Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 May 2019 08:18:54 +0700
Subject: [PATCH] Add two more fixes

* Fix determination of custom keyboard from package
* Add Toast notification when re-installing a lexical model.
---
 .../java/com/tavultesoft/kmea/KeyboardPickerActivity.java    | 2 +-
 .../main/java/com/tavultesoft/kmea/ModelPickerActivity.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
index 2e08c1f114..3c49429378 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
@@ -327,7 +327,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O
   protected static boolean hasKeyboardFromPackage() {
     for(HashMap<String, String> kbInfo: keyboardsList) {
       String customKeyboard = MapCompat.getOrDefault(kbInfo, KMManager.KMKey_CustomKeyboard, "N");
-      if (!customKeyboard.equalsIgnoreCase("Y")) {
+      if (customKeyboard.equalsIgnoreCase("Y")) {
         return true;
       }
     }
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelPickerActivity.java
index 1c7ab5b747..f546ec155b 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelPickerActivity.java
@@ -463,7 +463,10 @@ public final class ModelPickerActivity extends AppCompatActivity {
               // we only need to add the model to the list of installed models
               // Add help link
               modelInfo.put(KMManager.KMKey_CustomHelpLink, "");
-              KMManager.addLexicalModel(context, modelInfo);
+              boolean result = KMManager.addLexicalModel(context, modelInfo);
+              if (result) {
+                Toast.makeText(context, "Model installed", Toast.LENGTH_SHORT).show();
+              }
             } else {
               // Model isn't installed so prompt to download it
               Bundle args = new Bundle();