From 57dcdf3b2be7e5ff22ef8cb4f4ed7be2bd4950fa Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 29 Jan 2020 16:19:09 +0700
Subject: [PATCH] fix(android): Pass language ID to ConformDialogFragment

When cancelling the Android system notifications about lexical model update being available, the notification would still remain.

This passes the language ID so the dialog can be cancelled.
---
 .../main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java  | 3 ++-
 .../com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java
index 838bf022bf..38bc4a0364 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java
@@ -49,13 +49,14 @@ public class ConfirmDialogFragment extends DialogFragment {
   }
 
   public static ConfirmDialogFragment newInstanceForLexicalModel(DialogType dialogType, String title, String message,
-                                                             String aModelId,
+                                                             String aLangId, String aModelId,
                                                              ArrayList<CloudApiTypes.CloudApiParam> aQueries) {
     ConfirmDialogFragment frag = new ConfirmDialogFragment();
     Bundle args = new Bundle();
     args.putSerializable(ARG_DIALOG_TYPE, dialogType);
     args.putString(ARG_TITLE, title);
     args.putString(ARG_MESSAGE, message);
+    args.putString(ARG_LANG_ID_KEY, aLangId);
     args.putString(ARG_MODEL_ID_KEY, aModelId);
     args.putSerializable(ARG_DOWNLOAD_QUERIES_KEY,aQueries);
     frag.setArguments(args);
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java
index c122381785..14e8507749 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java
@@ -144,7 +144,7 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity {
       title = String.format("%s: %s", langName, modelName);
       dialog = ConfirmDialogFragment.newInstanceForLexicalModel(
         DIALOG_TYPE_DOWNLOAD_MODEL, title, getString(R.string.confirm_download_model),
-        modelID,
+        langID, modelID,
         prepareCloudApiParamsForLexicalModelDownload());
     } else {
       dialog = ConfirmDialogFragment.newInstanceForKeyboard(