From 8bf94b3e68fd64ff8d0f17985a4e26d1930e3374 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 21 Oct 2022 11:27:35 +0700
Subject: [PATCH] fix(android): Add configure step

---
 android/build.sh | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/android/build.sh b/android/build.sh
index 2a67403c63..1a5d4ac9f7 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -24,6 +24,7 @@ builder_describe \
   "Build Keyman Engine for Android, Keyman for Android, and FirstVoices Android app." \
   clean \
   build \
+  "configure              Download asset .kmp files from downloads.keyman.com" \
   "publish                Publishes the APKs to the Play Store." \
   ":app                   Keyman for Android" \
   ":engine                Keyman Engine for Android" \
@@ -32,7 +33,6 @@ builder_describe \
   ":fv                    OEM FirstVoices app" \
   "--ci                   Don't start the Gradle daemon. Use for CI" \
   "--debug,-d             Local debug build; use for development builds" \
-  "--download-resources   Download asset .kmp files from downloads.keyman.com" \
   "--no-kmw-build,-nkmwb  Don't build KMW. Just copy existing artifacts" \
   "--no-kmw,-nkmw         Don't build KMW. Don't copy artifacts" \
   "--upload-sentry,-us    Uploads debug symbols, etc, to Sentry" 
@@ -52,11 +52,6 @@ elif builder_has_option --no-kmw; then
   KMEA_FLAGS="-no-kmw"
 fi
 
-# Build flags that apply to apps that include asset .kmp files
-if builder_has_option --download-resources; then
-  KMAPRO_FLAGS="$KMAPRO_FLAGS -download-resources"
-fi
-
 # Build flags that apply to all targets
 if builder_has_option --ci; then
   KMEA_FLAGS="$KMEA_FLAGS -no-daemon"
@@ -116,6 +111,30 @@ function _clean() {
   ./build.sh clean
 }
 
+function _configure() {
+  . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
+
+  # Keyman for Android .kmp dependencies
+  KEYBOARD_PACKAGE_ID="sil_euro_latin"
+  KEYBOARDS_TARGET="$KEYMAN_ROOT/android/KMAPro/kMAPro/src/main/assets/${KEYBOARD_PACKAGE_ID}.kmp"
+  MODEL_PACKAGE_ID="nrc.en.mtnt"
+  MODELS_TARGET="$KEYMAN_ROOT/android/KMAPro/kMAPro/src/main/assets/${MODEL_PACKAGE_ID}.model.kmp"
+
+  downloadKeyboardPackage "$KEYBOARD_PACKAGE_ID" "$KEYBOARDS_TARGET"
+  downloadModelPackage "$MODEL_PACKAGE_ID" "$MODELS_TARGET"
+
+  # FirstVoices .csv and .kmp dependencies (dictionaries downloaded within the app)
+  FV_KEYBOARD_PACKAGE_ID="fv_all"
+  FV_KEYBOARDS_TARGET="$KEYMAN_ROOT/oem/firstvoices/android/app/src/main/assets/${FV_KEYBOARD_PACKAGE_ID}.kmp"
+  KEYBOARDS_CSV="$KEYMAN_ROOT/oem/firstvoices/keyboards.csv"
+  KEYBOARDS_CSV_TARGET="$KEYMAN_ROOT/oem/firstvoices/android/app/src/main/assets/keyboards.csv"
+
+  echo "Copying keyboards.csv"
+  cp "$KEYBOARDS_CSV" "$KEYBOARDS_CSV_TARGET"
+
+  downloadKeyboardPackage "$FV_KEYBOARD_PACKAGE_ID" "$FV_KEYBOARDS_TARGET"
+}
+
 function _build_engine() {
   cd "$KEYMAN_ROOT/android/KMEA"
   ./build.sh $KMEA_FLAGS
@@ -174,6 +193,12 @@ if builder_start_action clean; then
   builder_finish_action success clean
 fi
 
+# Download .kmp resources
+if builder_start_action configure; then
+  _configure
+  builder_finish_action success configure
+fi  
+
 # Building Keyman Engine for Android
 if builder_start_action build:engine; then
   _build_engine