fix(android-app): address PR review issues from CodeRabbit

Siddhesh2377 · Siddhesh2377 · commit 00c73b43c575 · 2026-02-23T07:45:44.000+05:30
- Move windowSoftInputMode from &lt;application&gt; to &lt;activity&gt; (was silently ignored)
- Fix %.2f literal string in LoraManagerScreen (now uses .format())
- Make ChatViewModel.refreshLoraState() public, call on picker dismiss
- Add download timeouts (30s connect, 60s read), cancellation, atomic temp file
- Unload adapter before deleting file to prevent native crash
- Make checkCompatibility async (off main thread)
- Fix JNI local-ref leak for jModelId in lora registry register
- Add malloc failure check for compatible_model_ids array
- Fix build-sdk.sh --skip-cpp flag not working (FLAGS array was unused)
diff --git a/examples/android/RunAnywhereAI/app/src/main/AndroidManifest.xml b/examples/android/RunAnywhereAI/app/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RunAnywhereAI"
-        android:windowSoftInputMode="adjustResize"
         android:largeHeap="true"
         android:usesCleartextTraffic="false"
         tools:targetApi="35">
@@ -41,6 +40,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.RunAnywhereAI">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/chat/ChatScreen.kt b/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/chat/ChatScreen.kt
@@ -218,7 +218,10 @@ fun ChatScreen(viewModel: ChatViewModel = viewModel()) {
     if (showingLoraAdapterPicker) {
         LoraAdapterPickerSheet(
             loraViewModel = loraViewModel,
-            onDismiss = { showingLoraAdapterPicker = false },
+            onDismiss = {
+                showingLoraAdapterPicker = false
+                viewModel.refreshLoraState()
+            },
         )
     }
 
diff --git a/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/chat/ChatViewModel.kt b/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/chat/ChatViewModel.kt
@@ -801,7 +801,7 @@ class ChatViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     /** Refresh LoRA loaded state for the active adapters indicator. */
-    private fun refreshLoraState() {
+    fun refreshLoraState() {
         viewModelScope.launch {
             try {
                 val loaded = RunAnywhere.getLoadedLoraAdapters()
diff --git a/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/lora/LoraManagerScreen.kt b/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/lora/LoraManagerScreen.kt
@@ -98,7 +98,7 @@ fun LoraManagerScreen(
                                     fontWeight = FontWeight.Medium,
                                 )
                                 Text(
-                                    "Scale: %.2f  |  ${if (adapter.applied) "Applied" else "Pending"}",
+                                    "Scale: ${"%.2f".format(adapter.scale)}  |  ${if (adapter.applied) "Applied" else "Pending"}",
                                     style = MaterialTheme.typography.bodySmall,
                                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
diff --git a/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/lora/LoraViewModel.kt b/examples/android/RunAnywhereAI/app/src/main/java/com/runanywhere/runanywhereai/presentation/lora/LoraViewModel.kt
@@ -17,6 +17,7 @@ import com.runanywhere.sdk.public.extensions.loadLoraAdapter
 import com.runanywhere.sdk.public.extensions.loraAdaptersForModel
 import com.runanywhere.sdk.public.extensions.removeLoraAdapter
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -42,6 +43,7 @@ class LoraViewModel(application: Application) : AndroidViewModel(application) {
 
     private val _uiState = MutableStateFlow(LoraUiState())
     val uiState: StateFlow<LoraUiState> = _uiState.asStateFlow()
+    private var downloadJob: Job? = null
 
     private val loraDir: File by lazy {
         File(application.filesDir, "lora_adapters").also { it.mkdirs() }
@@ -133,8 +135,13 @@ class LoraViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     /** Check if a LoRA adapter file is compatible with the current model. */
-    fun checkCompatibility(loraPath: String): LoraCompatibilityResult {
-        return RunAnywhere.checkLoraCompatibility(loraPath)
+    fun checkCompatibility(loraPath: String, onResult: (LoraCompatibilityResult) -> Unit) {
+        viewModelScope.launch {
+            val result = withContext(Dispatchers.IO) {
+                RunAnywhere.checkLoraCompatibility(loraPath)
+            }
+            onResult(result)
+        }
     }
 
     /** Get the local file path for a catalog entry, or null if not downloaded. */
@@ -164,17 +171,21 @@ class LoraViewModel(application: Application) : AndroidViewModel(application) {
             error = null,
         )
 
-        viewModelScope.launch {
+        downloadJob = viewModelScope.launch {
             try {
                 val destFile = File(loraDir, entry.filename)
+                val tmpFile = File(loraDir, "${entry.filename}.tmp")
                 withContext(Dispatchers.IO) {
-                    val connection = URL(entry.downloadUrl).openConnection()
+                    val connection = URL(entry.downloadUrl).openConnection().apply {
+                        connectTimeout = 30_000
+                        readTimeout = 60_000
+                    }
                     connection.connect()
                     val totalSize = connection.contentLengthLong.takeIf { it > 0 } ?: entry.fileSize
                     var downloaded = 0L
 
                     connection.getInputStream().buffered().use { input ->
-                        destFile.outputStream().buffered().use { output ->
+                        tmpFile.outputStream().buffered().use { output ->
                             val buffer = ByteArray(8192)
                             var bytesRead: Int
                             while (input.read(buffer).also { bytesRead = it } != -1) {
@@ -187,6 +198,7 @@ class LoraViewModel(application: Application) : AndroidViewModel(application) {
                             }
                         }
                     }
+                    tmpFile.renameTo(destFile)
                 }
 
                 Log.i(TAG, "Downloaded LoRA adapter: ${entry.name} -> ${destFile.absolutePath}")
@@ -205,12 +217,36 @@ class LoraViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
-    /** Delete a downloaded adapter file. */
+    /** Cancel an in-progress download. */
+    fun cancelDownload() {
+        downloadJob?.cancel()
+        downloadJob = null
+        _uiState.value = _uiState.value.copy(
+            downloadingAdapterId = null,
+            downloadProgress = 0f,
+        )
+    }
+
+    /** Delete a downloaded adapter file. Unloads the adapter first if loaded. */
     fun deleteAdapter(entry: LoraAdapterCatalogEntry) {
-        val file = File(loraDir, entry.filename)
-        if (file.exists()) {
-            file.delete()
-            Log.i(TAG, "Deleted LoRA adapter file: ${entry.filename}")
+        viewModelScope.launch {
+            try {
+                val file = File(loraDir, entry.filename)
+                // Unload first if currently loaded
+                if (isLoaded(entry)) {
+                    file.absolutePath.let { RunAnywhere.removeLoraAdapter(it) }
+                    Log.i(TAG, "Unloaded LoRA adapter before delete: ${entry.filename}")
+                }
+                if (file.exists()) {
+                    file.delete()
+                    Log.i(TAG, "Deleted LoRA adapter file: ${entry.filename}")
+                }
+                val loaded = RunAnywhere.getLoadedLoraAdapters()
+                _uiState.value = _uiState.value.copy(loadedAdapters = loaded)
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to delete adapter: ${entry.filename}", e)
+                _uiState.value = _uiState.value.copy(error = "Delete failed: ${e.message}")
+            }
         }
     }
 
diff --git a/sdk/runanywhere-commons/src/jni/runanywhere_commons_jni.cpp b/sdk/runanywhere-commons/src/jni/runanywhere_commons_jni.cpp
@@ -1243,12 +1243,23 @@ Java_com_runanywhere_sdk_native_bridge_RunAnywhereBridge_racLoraRegistryRegister
     jsize model_count = compatibleModelIds ? env->GetArrayLength(compatibleModelIds) : 0;
     if (model_count > 0) {
         entry.compatible_model_ids = static_cast<char**>(malloc(sizeof(char*) * model_count));
+        if (!entry.compatible_model_ids) {
+            free(entry.id); free(entry.name); free(entry.description);
+            free(entry.download_url); free(entry.filename);
+            if (id_str) env->ReleaseStringUTFChars(id, id_str);
+            if (name_str) env->ReleaseStringUTFChars(name, name_str);
+            if (desc_str) env->ReleaseStringUTFChars(description, desc_str);
+            if (url_str) env->ReleaseStringUTFChars(downloadUrl, url_str);
+            if (file_str) env->ReleaseStringUTFChars(filename, file_str);
+            return RAC_ERROR_OUT_OF_MEMORY;
+        }
         entry.compatible_model_count = model_count;
         for (jsize i = 0; i < model_count; ++i) {
             jstring jModelId = static_cast<jstring>(env->GetObjectArrayElement(compatibleModelIds, i));
             const char* mid_str = jModelId ? env->GetStringUTFChars(jModelId, nullptr) : nullptr;
             entry.compatible_model_ids[i] = mid_str ? strdup(mid_str) : nullptr;
             if (mid_str) env->ReleaseStringUTFChars(jModelId, mid_str);
+            if (jModelId) env->DeleteLocalRef(jModelId);
         }
     }
 
diff --git a/sdk/runanywhere-kotlin/scripts/build-sdk.sh b/sdk/runanywhere-kotlin/scripts/build-sdk.sh
@@ -41,18 +41,14 @@ for arg in "$@"; do
     esac
 done
 
-# Build flags for build-kotlin.sh
-FLAGS=(--local)
+if [ "$SKIP_CPP" = true ] && [ "$CPP_ONLY" = true ]; then
+    echo "Cannot use --skip-cpp and --cpp-only together"
+    exit 1
+fi
 
 if [ "$SKIP_CPP" = true ]; then
-    # Just copy .so files and build Kotlin
-    FLAGS+=(--skip-build)
-    if [ "$CPP_ONLY" = true ]; then
-        echo "Cannot use --skip-cpp and --cpp-only together"
-        exit 1
-    fi
-    # Run copy + Kotlin build
-    exec "${SCRIPT_DIR}/build-kotlin.sh" --local "${PASSTHROUGH_ARGS[@]}"
+    # Skip C++ build, just copy .so files and build Kotlin
+    exec "${SCRIPT_DIR}/build-kotlin.sh" --local --skip-build "${PASSTHROUGH_ARGS[@]}"
 elif [ "$CPP_ONLY" = true ]; then
     # Build C++ + copy, skip Kotlin Gradle build
     exec "${SCRIPT_DIR}/build-kotlin.sh" --local --rebuild-commons --skip-build "${PASSTHROUGH_ARGS[@]}"

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,10 @@ fun ChatScreen(viewModel: ChatViewModel = viewModel()) {`
`218`	`218`	`if (showingLoraAdapterPicker) {`
`219`	`219`	`LoraAdapterPickerSheet(`
`220`	`220`	`loraViewModel = loraViewModel,`
`221`		`- onDismiss = { showingLoraAdapterPicker = false },`
	`221`	`+ onDismiss = {`
	`222`	`+ showingLoraAdapterPicker = false`
	`223`	`+ viewModel.refreshLoraState()`
	`224`	`+ },`
`222`	`225`	`)`
`223`	`226`	`}`
`224`	`227`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ class ChatViewModel(application: Application) : AndroidViewModel(application) {`
`801`	`801`	`}`
`802`	`802`
`803`	`803`	`/** Refresh LoRA loaded state for the active adapters indicator. */`
`804`		`- private fun refreshLoraState() {`
	`804`	`+ fun refreshLoraState() {`
`805`	`805`	`viewModelScope.launch {`
`806`	`806`	`try {`
`807`	`807`	`val loaded = RunAnywhere.getLoadedLoraAdapters()`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ fun LoraManagerScreen(`
`98`	`98`	`fontWeight = FontWeight.Medium,`
`99`	`99`	`)`
`100`	`100`	`Text(`
`101`		`- "Scale: %.2f \| ${if (adapter.applied) "Applied" else "Pending"}",`
	`101`	`+ "Scale: ${"%.2f".format(adapter.scale)} \| ${if (adapter.applied) "Applied" else "Pending"}",`
`102`	`102`	`style = MaterialTheme.typography.bodySmall,`
`103`	`103`	`color = MaterialTheme.colorScheme.onSurfaceVariant,`
`104`	`104`	`)`