Skip to content

Harden Android startup against missing resources #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cowboydaniel merged 1 commit into from
Nov 20, 2025
Merged

Harden Android startup against missing resources #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions android/android-studio/app/src/main/java/com/arduino/ide/mobile/project/SketchProject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.arduino.ide.mobile.project

import android.content.Context
import android.util.Log
import java.io.File

/**
Expand Down Expand Up @@ -83,10 +84,15 @@ class SketchProject(
""".trimIndent()
)

val sketchFiles = files.map { (name, body) ->
val sketchFiles = files.mapNotNull { (name, body) ->
val file = File(demoRoot, name)
file.writeText(body)
SketchFile(name = name, path = file.absolutePath, content = body)
runCatching {
file.writeText(body)
SketchFile(name = name, path = file.absolutePath, content = body)
}.getOrElse { error ->
Log.e("SketchProject", "Failed to seed demo sketch file $name", error)
null
}
}

return SketchProject("Blink", demoRoot, sketchFiles)
Expand Down
22 changes: 14 additions & 8 deletions ...oid/android-studio/app/src/main/java/com/arduino/ide/mobile/snippets/SnippetRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.arduino.ide.mobile.snippets

import android.content.Context
import android.util.Log
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
Expand Down Expand Up @@ -62,15 +63,20 @@ class SnippetRepository(
.map { prefs -> parseUserSnippets(prefs) }

private suspend fun loadBundledSnippets(): List<Snippet> = withContext(dispatcher) {
val assetManager = context.assets
val directories = assetManager.list("snippets") ?: emptyArray()
val snippets = mutableListOf<Snippet>()
directories.forEach { assetFile ->
val stream = assetManager.open("snippets/$assetFile")
val content = stream.bufferedReader().use { it.readText() }
snippets += parseSnippetArray(JSONArray(content), isUserDefined = false)
runCatching {
val assetManager = context.assets
val directories = assetManager.list("snippets") ?: emptyArray()
val snippets = mutableListOf<Snippet>()
directories.forEach { assetFile ->
val stream = assetManager.open("snippets/$assetFile")
val content = stream.bufferedReader().use { it.readText() }
snippets += parseSnippetArray(JSONArray(content), isUserDefined = false)
}
snippets
}.getOrElse { error ->
Log.e("SnippetRepository", "Failed to load bundled snippets", error)
emptyList()
}
snippets
}

private fun parseUserSnippets(prefs: Preferences): List<Snippet> {
Expand Down
Loading