Skip to content

ProCraft for Android: An Android native painting app written in Rust

Rust

fix(brushes): import brush files without a known extension and large packs

Josh3eff553911c4
diff --git a/apps/procraft-android/android/app/src/main/AndroidManifest.xml b/apps/procraft-android/android/app/src/main/AndroidManifest.xml
index ac62e4f..117d2a9 100644
--- a/apps/procraft-android/android/app/src/main/AndroidManifest.xml
+++ b/apps/procraft-android/android/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
<application
android:allowBackup="false"
android:enableOnBackInvokedCallback="true"
+ android:largeHeap="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
index e32b338..46d84e5 100644
--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/canvas/CanvasViewModel.kt
@@ -3234,15 +3234,51 @@ class CanvasViewModel(app: Application) : AndroidViewModel(app) {
/** A brush or set file from elsewhere: it joins the library and its set is shown. */
fun importBrushes(uri: android.net.Uri) {
viewModelScope.launch {
- val bytes = withContext(Dispatchers.IO) {
- runCatching { getApplication<Application>().contentResolver.openInputStream(uri)?.use { it.readBytes() } }.getOrNull()
- } ?: return@launch
+ val read = withContext(Dispatchers.IO) { runCatching { readAll(uri) } }
+ val bytes = read.getOrNull()
+ if (bytes == null) {
+ message = if (read.exceptionOrNull() is OutOfMemoryError) "This file is too large to import." else "This file could not be read."
+ return@launch
+ }
val name = withContext(Dispatchers.IO) { fileName(uri) }
- val added = if (name != null && isOtherBrushFile(name)) addOtherBrushes(bytes, name) else addBrushes(bytes)
+ // the name says which kind, when it has one we know; else our own kinds first, then
+ // the other apps' (each told apart by its contents)
+ val added = if (name != null && isOtherBrushFile(name)) {
+ addOtherBrushes(bytes, name)
+ } else {
+ addBrushes(bytes) || addOtherBrushes(bytes, name ?: "Imported")
+ }
if (!added) message = "This file has no brushes in it."
}
}
+ /** All of [uri]'s bytes, read into one array of the file's own size when it is known. */
+ private fun readAll(uri: android.net.Uri): ByteArray {
+ val resolver = getApplication<Application>().contentResolver
+ val size = runCatching { resolver.openFileDescriptor(uri, "r")?.use { it.statSize } }.getOrNull() ?: -1L
+ val stream = resolver.openInputStream(uri) ?: throw java.io.IOException("no stream")
+ return stream.use { input ->
+ if (size in 0..Int.MAX_VALUE.toLong()) {
+ val out = ByteArray(size.toInt())
+ var at = 0
+ while (at < out.size) {
+ val n = input.read(out, at, out.size - at)
+ if (n < 0) break
+ at += n
+ }
+ if (at < out.size) {
+ out.copyOf(at)
+ } else {
+ // a file that grew since its size was read
+ val more = input.readBytes()
+ if (more.isEmpty()) out else out + more
+ }
+ } else {
+ input.readBytes()
+ }
+ }
+ }
+
/**
* Another app's brushes [bytes] as a set of brushes named after the file [name] (shown),
* or, with no canvas open, kept until one opens; false if the file has none.