@focus8/expo-acapela-tts 0.1.6 → 0.1.9

package/android/build.gradle

@@ -32,6 +32,13 @@ android {
   defaultConfig {
     versionCode 1
     versionName "0.1.0"
+
+    buildConfigField "long", "ACAPELA_USER_ID", "${System.getenv('ACAPELA_USER_ID') ?: '0'}L"
+    buildConfigField "long", "ACAPELA_PASSWORD", "${System.getenv('ACAPELA_PASSWORD') ?: '0'}L"
+    buildConfigField "String", "ACAPELA_LICENSE_KEY", "\"${System.getenv('ACAPELA_LICENSE_KEY') ?: ''}\""
+  }
+  buildFeatures {
+    buildConfig true
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/acapelatts/ExpoAcapelaTtsModule.kt

@@ -113,11 +113,11 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
       }
     }
 
-    Function("setLicense") { userId: Long, password: Long, key: String ->
-      licenseUserId = userId
-      licensePassword = password
+    Function("setLicense") { userId: Double, password: Double, key: String ->
+      licenseUserId = userId.toLong()
+      licensePassword = password.toLong()
       licenseKey = key
-      logInfo("License set")
+      logInfo("License set: userId=0x${java.lang.Long.toHexString(licenseUserId!!)} password=0x${java.lang.Long.toHexString(licensePassword!!)}")
     }
 
     AsyncFunction("initializeAsync") {
@@ -131,8 +131,13 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
         return@AsyncFunction true
       }
 
-      if (licenseUserId == null || licensePassword == null || licenseKey == null) {
-        logWarning("Cannot initialize: license not set. Call setLicense() first.")
+      // Use BuildConfig values as fallback if setLicense() was not called from JS
+      val uid = licenseUserId ?: BuildConfig.ACAPELA_USER_ID
+      val pwd = licensePassword ?: BuildConfig.ACAPELA_PASSWORD
+      val key = licenseKey ?: BuildConfig.ACAPELA_LICENSE_KEY
+
+      if (uid == 0L || key.isNullOrEmpty()) {
+        logWarning("Cannot initialize: no license configured (neither via setLicense() nor BuildConfig)")
         return@AsyncFunction false
       }
 
@@ -144,7 +149,13 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
 
         tts = acattsandroid(context, this@ExpoAcapelaTtsModule, null)
         tts!!.setLog(true)
-        tts!!.setLicense(licenseUserId!!, licensePassword!!, licenseKey)
+        logInfo("setLicense userId=0x${java.lang.Long.toHexString(uid)} password=0x${java.lang.Long.toHexString(pwd)} keyLength=${key?.length}")
+        tts!!.setLicense(uid, pwd, key)
+
+        // Store for re-use after getVoicesList
+        licenseUserId = uid
+        licensePassword = pwd
+        licenseKey = key
 
         val version = tts!!.version
         logInfo("Initialized, SDK version: $version")
@@ -178,6 +189,10 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
           }
         }
         val voicesList = tts!!.getVoicesList(voiceDirPaths) ?: emptyArray()
+        // Re-set license after getVoicesList as it may reset internal state
+        if (licenseUserId != null && licensePassword != null && licenseKey != null) {
+          tts!!.setLicense(licenseUserId!!, licensePassword!!, licenseKey)
+        }
         logInfo("Found ${voicesList.size} voices")
         for (v in voicesList) {
           logInfo("  Voice: $v")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@focus8/expo-acapela-tts",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Acapela TTS integration for Expo on Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",