Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Include Ensu in shared Android linting

Manav Rathic331d569d8d5
diff --git a/.github/checks/run.sh b/.github/checks/run.sh
index 28efdbb78a..4e80469f72 100755
--- a/.github/checks/run.sh
+++ b/.github/checks/run.sh
@@ -10,6 +10,6 @@ node .github/checks/documentation-comments/test.mjs
ruby .github/checks/workflow-paths/check.rb
ruby .github/checks/workflow-paths/test.rb
ruby .github/checks/workflow-security/test.rb
-node .github/checks/wasm-ci-paths/check.mjs
-node --test .github/checks/wasm-ci-paths/test.mjs
+node .github/checks/rust-ci-paths/check.mjs
+node --test .github/checks/rust-ci-paths/test.mjs
node --test .github/scripts/ci/test.mjs
diff --git a/.github/checks/wasm-ci-paths/check.mjs b/.github/checks/rust-ci-paths/check.mjs
similarity index 50%
rename from .github/checks/wasm-ci-paths/check.mjs
rename to .github/checks/rust-ci-paths/check.mjs
index 2e91b4918b..26c171f5cb 100644
--- a/.github/checks/wasm-ci-paths/check.mjs
+++ b/.github/checks/rust-ci-paths/check.mjs
@@ -4,50 +4,65 @@ import { dirname, relative, resolve } from "node:path";
const root = realpathSync(process.argv[2] ?? ".");
const pathsFile = ".github/scripts/ci/paths.json";
-const patterns = readJSON(resolve(root, pathsFile))["web-lint"];
+const workflows = readJSON(resolve(root, pathsFile));
+const bindings = {
+ "android-lint": "uniffi",
+ "desktop-lint": "napi",
+ "ensu-android-build": "uniffi",
+ "ensu-ios-build": "uniffi",
+ "mobile-lint": "frb",
+};
+const { packages } = JSON.parse(
+ execFileSync(
+ "cargo",
+ [
+ "metadata",
+ "--no-deps",
+ "--format-version",
+ "1",
+ "--locked",
+ "--offline",
+ ],
+ { cwd: resolve(root, "rust"), encoding: "utf8" },
+ ),
+);
+const byName = new Map(packages.map((pkg) => [pkg.name, pkg]));
+const byDirectory = new Map(
+ packages.map((pkg) => [dirname(pkg.manifest_path), pkg]),
+);
-if (patterns !== null) {
+for (const [workflow, patterns] of Object.entries(workflows)) {
+ if (
+ !["web-lint", "rust-cli-test"].includes(workflow) &&
+ !bindings[workflow]
+ )
+ continue;
+ if (patterns === null) continue;
if (patterns.some((pattern) => pattern.startsWith("!"))) {
throw new Error(
- `${pathsFile}: WASM coverage does not support negated paths`,
+ `${pathsFile}: ${workflow} coverage does not support negated paths`,
);
}
+ const roots = workflow === "web-lint" ? wasmRoots() : nativeRoots(workflow);
// Literal directory prefixes prove coverage of future files too.
const prefixes = patterns
.filter((pattern) => /^[\w./-]+\/\*\*$/.test(pattern))
.map((pattern) => pattern.slice(0, -2));
- for (const path of wasmPaths().sort()) {
+ const includeTests = ["mobile-lint", "rust-cli-test"].includes(workflow);
+ for (const path of dependencyPaths(roots, includeTests).sort()) {
if (
patterns.includes(path) ||
prefixes.some((prefix) => path.startsWith(prefix))
)
continue;
console.error(
- `${pathsFile}: missing WASM dependency path ${JSON.stringify(path)}`,
+ `${pathsFile}: ${workflow} missing Rust dependency path ${JSON.stringify(path)}`,
);
process.exitCode = 1;
}
}
-function wasmPaths() {
- const { packages } = JSON.parse(
- execFileSync(
- "cargo",
- [
- "metadata",
- "--no-deps",
- "--format-version",
- "1",
- "--locked",
- "--offline",
- ],
- { cwd: resolve(root, "rust"), encoding: "utf8" },
- ),
- );
- const byName = new Map(packages.map((pkg) => [pkg.name, pkg]));
- const byDirectory = new Map(
- packages.map((pkg) => [dirname(pkg.manifest_path), pkg]),
- );
+function wasmRoots() {
const pending = [];
for (const path of globSync("web/packages/wasm/*/package.json", {
cwd: root,
@@ -61,6 +76,22 @@ function wasmPaths() {
}
if (!pending.length) throw new Error("No Web WASM packages found");
+ return pending;
+}
+
+function nativeRoots(workflow) {
+ if (workflow === "rust-cli-test")
+ return [resolve(root, "rust/apps/cli-next")];
+ return [
+ ...globSync(`rust/bindings/${bindings[workflow]}/*/Cargo.toml`, {
+ cwd: root,
+ }).map((path) => dirname(resolve(root, path))),
+ resolve(root, "rust/tools/codegen"),
+ ];
+}
+
+function dependencyPaths(pending, includeTests) {
+ const tested = new Set(includeTests ? pending : []);
const directories = new Set();
while (pending.length) {
const directory = pending.pop();
@@ -72,11 +103,15 @@ function wasmPaths() {
`Local dependency ${directory} is outside the Rust workspace`,
);
for (const dependency of pkg.dependencies) {
- if (dependency.kind !== "dev" && dependency.path)
+ if (
+ dependency.path &&
+ (dependency.kind !== "dev" || tested.has(directory))
+ )
pending.push(dependency.path);
}
}
return [
+ "rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
...[...directories].map((dir) => `${relative(root, dir)}/**`),
diff --git a/.github/checks/wasm-ci-paths/test.mjs b/.github/checks/rust-ci-paths/test.mjs
similarity index 61%
rename from .github/checks/wasm-ci-paths/test.mjs
rename to .github/checks/rust-ci-paths/test.mjs
index b4289cc6d6..977ad3245c 100644
--- a/.github/checks/wasm-ci-paths/test.mjs
+++ b/.github/checks/rust-ci-paths/test.mjs
@@ -8,8 +8,8 @@ import test from "node:test";
const script = join(import.meta.dirname, "check.mjs");
const pathsFile = ".github/scripts/ci/paths.json";
-test("Web CI covers transitive local WASM dependencies", (t) => {
- const root = mkdtempSync(join(tmpdir(), "ente-wasm-ci-paths-"));
+test("CI covers transitive local Rust dependencies", (t) => {
+ const root = mkdtempSync(join(tmpdir(), "ente-rust-ci-paths-"));
t.after(() => rmSync(root, { recursive: true }));
const write = (path, content) => {
mkdirSync(dirname(join(root, path)), { recursive: true });
@@ -27,8 +27,8 @@ edition = "2024"
${dependencies}`,
);
};
- const run = (patterns) => {
- write(pathsFile, JSON.stringify({ "web-lint": patterns }));
+ const run = (patterns, workflow = "web-lint") => {
+ write(pathsFile, JSON.stringify({ [workflow]: patterns }));
return spawnSync(process.execPath, [script, root], {
encoding: "utf8",
});
@@ -39,7 +39,7 @@ ${dependencies}`,
`
[workspace]
resolver = "2"
-members = ["bindings/wasm/*", "crates/*"]
+members = ["bindings/wasm/*", "bindings/uniffi/*", "crates/*", "tools/*", "apps/*"]
[workspace.dependencies]
shared-alias = { package = "shared", path = "crates/shared" }
`,
@@ -86,7 +86,28 @@ native-only = { path = "../../../crates/native-only" }
`,
);
+ crate(
+ "bindings/uniffi/app",
+ "app-native",
+ `[dependencies]
+native-only = { path = "../../../crates/native-only" }`,
+ );
+ crate(
+ "tools/codegen",
+ "codegen",
+ `[dependencies]
+builder = { path = "../../crates/builder" }`,
+ );
+
+ crate(
+ "apps/cli-next",
+ "cli",
+ `[dev-dependencies]
+test-only = { path = "../../crates/test-only" }`,
+ );
+
const base = [
+ "rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/wasm/**",
@@ -107,7 +128,7 @@ native-only = { path = "../../../crates/native-only" }
needed
.map(
(path) =>
- `${pathsFile}: missing WASM dependency path ${JSON.stringify(path)}\n`,
+ `${pathsFile}: web-lint missing Rust dependency path ${JSON.stringify(path)}\n`,
)
.join(""),
);
@@ -117,9 +138,48 @@ native-only = { path = "../../../crates/native-only" }
assert.equal(result.stdout, "");
assert.equal(result.stderr, "");
}
+ const nativeBase = [
+ "rust/.cargo/config.toml",
+ "rust/Cargo.lock",
+ "rust/Cargo.toml",
+ "rust/bindings/uniffi/**",
+ "rust/tools/codegen/**",
+ ];
+ result = run(nativeBase, "android-lint");
+ assert.equal(result.status, 1, result.stderr);
+ assert.equal(
+ result.stderr,
+ ["builder", "native-only"]
+ .map(
+ (name) =>
+ `${pathsFile}: android-lint missing Rust dependency path "rust/crates/${name}/**"\n`,
+ )
+ .join(""),
+ );
+ result = run(
+ [...nativeBase, "rust/crates/builder/**", "rust/crates/native-only/**"],
+ "android-lint",
+ );
+ assert.equal(result.status, 0, result.stderr);
+
+ result = run(["rust/apps/cli-next/**", ...base], "rust-cli-test");
+ assert.equal(result.status, 1, result.stderr);
+ assert.equal(
+ result.stderr,
+ `${pathsFile}: rust-cli-test missing Rust dependency path "rust/crates/test-only/**"\n`,
+ );
+ result = run(
+ ["rust/apps/cli-next/**", "rust/crates/test-only/**", ...base],
+ "rust-cli-test",
+ );
+ assert.equal(result.status, 0, result.stderr);
+
result = run([...base, ...needed, "!rust/crates/leaf/private/**"]);
assert.equal(result.status, 1);
- assert.match(result.stderr, /WASM coverage does not support negated paths/);
+ assert.match(
+ result.stderr,
+ /web-lint coverage does not support negated paths/,
+ );
assert.equal(result.stdout, "");
write(
"web/packages/wasm/app/package.json",
diff --git a/.github/scripts/ci/paths.json b/.github/scripts/ci/paths.json
index c961663241..fd7296f8f1 100644
--- a/.github/scripts/ci/paths.json
+++ b/.github/scripts/ci/paths.json
@@ -1,5 +1,19 @@
{
- "android-lint": [".github/workflows/android-lint.yml", "android/**"],
+ "android-lint": [
+ ".github/workflows/android-lint.yml",
+ "android/**",
+ "rust/.cargo/config.toml",
+ "rust/Cargo.lock",
+ "rust/Cargo.toml",
+ "rust/bindings/uniffi/**",
+ "rust/crates/assets/**",
+ "rust/crates/cast/**",
+ "rust/crates/core/**",
+ "rust/crates/ensu/**",
+ "rust/crates/ensu-crypto/**",
+ "rust/crates/image/**",
+ "rust/tools/codegen/**"
+ ],
"apple-lint": [".github/workflows/apple-lint.yml", "apple/**"],
"dependency-review": [
"**/Cargo.lock",
@@ -18,9 +32,11 @@
"desktop-lint": [
".github/workflows/desktop-lint.yml",
"desktop/**",
+ "rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/napi/**",
+ "rust/crates/assets/**",
"rust/crates/image/**",
"rust/crates/ml/**",
"rust/crates/vecdb/**",
@@ -36,13 +52,16 @@
"android/gradlew",
"android/gradlew.bat",
"android/apps/ensu/**",
- "android/apps/ensu/rust/**",
"rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/uniffi/**",
+ "rust/crates/assets/**",
+ "rust/crates/cast/**",
"rust/crates/core/**",
"rust/crates/ensu/**",
+ "rust/crates/ensu-crypto/**",
+ "rust/crates/image/**",
"rust/tools/codegen/**"
],
"ensu-ios-build": [
@@ -53,8 +72,12 @@
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/uniffi/**",
+ "rust/crates/assets/**",
+ "rust/crates/cast/**",
"rust/crates/core/**",
"rust/crates/ensu/**",
+ "rust/crates/ensu-crypto/**",
+ "rust/crates/image/**",
"rust/tools/codegen/**"
],
"infra-lint-staff": [
@@ -65,13 +88,20 @@
".github/actions/setup-flutter/**",
".github/workflows/mobile-lint.yml",
"mobile/**",
+ "rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/frb/**",
+ "rust/crates/accounts/**",
+ "rust/crates/assets/**",
"rust/crates/cast/**",
+ "rust/crates/collections/**",
"rust/crates/contacts/**",
"rust/crates/core/**",
+ "rust/crates/exif/**",
"rust/crates/image/**",
+ "rust/crates/legacy/**",
+ "rust/crates/location/**",
"rust/crates/locker/**",
"rust/crates/ml/**",
"rust/crates/photos/**",
@@ -91,13 +121,25 @@
"repo-lint": null,
"rust-cli-test": [
".github/workflows/rust-cli-test.yml",
- "rust/apps/cli-next/**"
+ "rust/.cargo/config.toml",
+ "rust/Cargo.lock",
+ "rust/Cargo.toml",
+ "rust/apps/cli-next/**",
+ "rust/crates/accounts/**",
+ "rust/crates/assets/**",
+ "rust/crates/collections/**",
+ "rust/crates/core/**",
+ "rust/crates/exif/**",
+ "rust/crates/location/**",
+ "rust/crates/photos/**",
+ "rust/crates/test-support/**"
],
"rust-lint": [".github/workflows/rust-lint.yml", "rust/**"],
"rust-test": [".github/workflows/rust-test.yml", "rust/**", "server/**"],
"server-lint": [".github/workflows/server-lint.yml", "server/**"],
"web-lint": [
".github/workflows/web-lint.yml",
+ "rust/.cargo/config.toml",
"rust/Cargo.lock",
"rust/Cargo.toml",
"rust/bindings/wasm/**",
diff --git a/.github/scripts/ci/test.mjs b/.github/scripts/ci/test.mjs
index 1bcd846811..caf46439e5 100644
--- a/.github/scripts/ci/test.mjs
+++ b/.github/scripts/ci/test.mjs
@@ -16,7 +16,7 @@ test("docs changes do not wait for unrelated workflows", (t) => {
checkResult(results(selected));
});
-test("Android lint configuration does not build Ensu", (t) => {
+test("Android lint configuration selects the lint workflow", (t) => {
for (const file of ["android/detekt.yml", "android/scripts/lint.sh"]) {
assert.deepEqual(select(t, [file]), ["android-lint", "repo-lint"]);
}
@@ -43,10 +43,12 @@ test("shared build inputs select their consumers", (t) => {
"repo-lint",
]);
assert.deepEqual(select(t, ["rust/crates/core/src/lib.rs"]), [
+ "android-lint",
"ensu-android-build",
"ensu-ios-build",
"mobile-lint",
"repo-lint",
+ "rust-cli-test",
"rust-lint",
"rust-test",
"web-lint",
diff --git a/.github/workflows/android-lint.yml b/.github/workflows/android-lint.yml
index 79c357c060..a4ecc18b7a 100644
--- a/.github/workflows/android-lint.yml
+++ b/.github/workflows/android-lint.yml
@@ -13,4 +13,17 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
+
+ - name: Restore Rust cache
+ uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+ with:
+ workspaces: rust
+ shared-key: photos-desktop-ensu-android
+ save-if: false
+
+ - name: Install Vulkan build dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y libvulkan-dev glslc
+
- run: ./android/scripts/lint.sh
diff --git a/android/apps/ensu/app/build.gradle.kts b/android/apps/ensu/app/build.gradle.kts
index 2a64702c59..c281f72cef 100644
--- a/android/apps/ensu/app/build.gradle.kts
+++ b/android/apps/ensu/app/build.gradle.kts
@@ -13,7 +13,7 @@ configurations.configureEach {
exclude(group = "com.google.guava", module = "listenablefuture")
}
-val keystorePropsFile = rootProject.file("key.properties")
+val keystorePropsFile = file("../key.properties")
val keystoreProps = Properties()
val hasReleaseKeystore = keystorePropsFile.exists()
if (hasReleaseKeystore) {
@@ -125,7 +125,6 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
- allWarningsAsErrors.set(true)
}
}
@@ -148,7 +147,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.navigation:navigation-compose:2.7.7")
- implementation(project(":rust"))
+ implementation(project(":ensu:rust"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
implementation("androidx.datastore:datastore-preferences:1.1.1")
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt
index c00fb92e07..1573ed113c 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt
@@ -33,15 +33,15 @@ import kotlinx.coroutines.launch
class AppStore(
context: Context,
private val sessionPreferences: SessionPreferencesDataStore,
- private val chatRepository: ChatRepository,
- private val llmProvider: LlmProvider,
+ chatRepository: ChatRepository,
+ llmProvider: LlmProvider,
knowledgeProvider: KnowledgeProvider,
val assetStore: AssetStore,
val transcriber: Transcriber,
private val deviceCapabilityProvider: AndroidDeviceCapabilityProvider,
val configDefaults: ConfigDefaults,
private val logRepository: FileLogRepository,
- private val clock: () -> Long = { System.currentTimeMillis() }
+ clock: () -> Long = { System.currentTimeMillis() }
) {
private val _state = MutableStateFlow(AppState())
val state: StateFlow<AppState> = _state.asStateFlow()
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
index 4d3b7e1fd3..da818433b1 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
@@ -1328,12 +1328,6 @@ internal class ChatStoreActions(
return text.trim()
}
- private fun trimToBudget(text: String, budget: Int): String {
- if (budget <= 0) return ""
- val maxChars = budget * 4
- return if (text.length <= maxChars) text else text.takeLast(maxChars)
- }
-
private fun estimateTokens(text: String): Int {
return max(1, text.length / 4)
}
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
index 2b6ab642f4..2c45065035 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
@@ -316,9 +316,9 @@ private enum class InlineMarkdownStyle {
Link
}
-private sealed class InlineMarkdownSegment {
- data class Text(val text: String, val style: InlineMarkdownStyle) : InlineMarkdownSegment()
- data class Math(val latex: String) : InlineMarkdownSegment()
+private sealed interface InlineMarkdownSegment {
+ data class Text(val text: String, val style: InlineMarkdownStyle) : InlineMarkdownSegment
+ data class Math(val latex: String) : InlineMarkdownSegment
}
private data class InlineMathMatch(
@@ -683,19 +683,16 @@ private fun styleForInlineSegment(
private fun colorForInlineSegment(
baseColor: androidx.compose.ui.graphics.Color,
inlineStyle: InlineMarkdownStyle
-): androidx.compose.ui.graphics.Color = when (inlineStyle) {
- InlineMarkdownStyle.Link -> EnsuColor.accent()
- else -> baseColor
-}
-
-private sealed class MarkdownBlock {
- data class Heading(val level: Int, val text: String) : MarkdownBlock()
- data class Paragraph(val text: String) : MarkdownBlock()
- data class BlockQuote(val text: String) : MarkdownBlock()
- data class Code(val text: String) : MarkdownBlock()
- data class Math(val text: String) : MarkdownBlock()
- data class ListItems(val items: List<String>) : MarkdownBlock()
- data object Divider : MarkdownBlock()
+): androidx.compose.ui.graphics.Color = if (inlineStyle == InlineMarkdownStyle.Link) EnsuColor.accent() else baseColor
+
+private sealed interface MarkdownBlock {
+ data class Heading(val level: Int, val text: String) : MarkdownBlock
+ data class Paragraph(val text: String) : MarkdownBlock
+ data class BlockQuote(val text: String) : MarkdownBlock
+ data class Code(val text: String) : MarkdownBlock
+ data class Math(val text: String) : MarkdownBlock
+ data class ListItems(val items: List<String>) : MarkdownBlock
+ data object Divider : MarkdownBlock
}
private object MarkdownParser {
@@ -770,8 +767,8 @@ private object MarkdownParser {
for (line in lines) {
val trimmed = line.trim()
- if (mathEndDelimiter != null) {
- val endDelimiter = mathEndDelimiter!!
+ val endDelimiter = mathEndDelimiter
+ if (endDelimiter != null) {
if (trimmed == endDelimiter) {
flushMath()
continue
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/VoiceInput.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/VoiceInput.kt
index 8832143bc4..4579639007 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/VoiceInput.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/VoiceInput.kt
@@ -63,7 +63,7 @@ internal fun VoiceInputState.statusText(): String? = when (this) {
VoiceInputState.Idle -> null
VoiceInputState.Recording -> "Listening..."
is VoiceInputState.Downloading -> {
- val suffix = percent?.let { " ($it%)" } ?: ""
+ val suffix = percent?.let { " ($it%)" }.orEmpty()
"Downloading voice model...$suffix"
}
VoiceInputState.Transcribing -> null
@@ -159,14 +159,14 @@ internal class VoiceTranscriptionController(
return@launch
}
Log.w(TAG, "Voice model download failed: ${error.message}", error)
- state = VoiceInputState.Error(downloadErrorMessage())
+ state = VoiceInputState.Error(downloadErrorMessage)
} catch (error: LlmException) {
if (error is LlmException.Cancelled) {
state = VoiceInputState.Idle
return@launch
}
Log.w(TAG, "Voice model download failed: ${error.message}", error)
- state = VoiceInputState.Error(downloadErrorMessage())
+ state = VoiceInputState.Error(downloadErrorMessage)
} catch (error: Throwable) {
Log.w(
TAG,
@@ -319,14 +319,14 @@ internal class VoiceTranscriptionController(
return@withMaintenanceSuspended
}
Log.w(TAG, "Voice model download failed: ${error.message}", error)
- state = VoiceInputState.Error(downloadErrorMessage())
+ state = VoiceInputState.Error(downloadErrorMessage)
} catch (error: LlmException) {
if (error is LlmException.Cancelled) {
state = VoiceInputState.Idle
return@withMaintenanceSuspended
}
Log.w(TAG, "Voice model download failed: ${error.message}", error)
- state = VoiceInputState.Error(downloadErrorMessage())
+ state = VoiceInputState.Error(downloadErrorMessage)
} catch (error: Throwable) {
Log.w(
TAG,
@@ -449,7 +449,7 @@ internal class VoiceTranscriptionController(
private fun minimumRecordingBytes(sampleRate: Int): Int = sampleRate / 4 * bytesPerSample
- private fun downloadErrorMessage(): String =
+ private val downloadErrorMessage =
"Voice model download failed. Check your connection and try again."
private fun transcriptionErrorMessage(error: TranscriptionException): String = when (error) {
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/components/ImageAttachmentThumbnail.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/components/ImageAttachmentThumbnail.kt
index dbf2a6928c..335a75ed41 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/components/ImageAttachmentThumbnail.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/components/ImageAttachmentThumbnail.kt
@@ -16,7 +16,6 @@ import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
@@ -60,9 +59,9 @@ fun ImageAttachmentThumbnail(
val maxHeight = maxOf(height, portraitHeight ?: height, squareSize ?: height)
val targetWidthPx = with(density) { maxWidth.roundToPx() }
val targetHeightPx = with(density) { maxHeight.roundToPx() }
- val image by produceState<DecodedImage?>(initialValue = null, path, targetWidthPx, targetHeightPx) {
+ val image = produceState<DecodedImage?>(initialValue = null, path, targetWidthPx, targetHeightPx) {
value = decodeSampledImage(path, targetWidthPx, targetHeightPx)
- }
+ }.value
val haptic = rememberHaptics()
val shape = RoundedCornerShape(EnsuCornerRadius.card.dp)
val resolvedWidth = when {
@@ -94,7 +93,7 @@ fun ImageAttachmentThumbnail(
) {
if (image != null) {
Image(
- bitmap = image!!.bitmap,
+ bitmap = image.bitmap,
contentDescription = contentDescription,
modifier = Modifier.fillMaxSize(),
contentScale = ContentScale.Crop
@@ -170,22 +169,22 @@ fun ImageAttachmentPreviewDialog(
) {
val targetWidthPx = with(density) { maxWidth.roundToPx() }
val targetHeightPx = with(density) { maxHeight.roundToPx() }
- val image by produceState<DecodedImage?>(initialValue = null, path, targetWidthPx, targetHeightPx) {
+ val image = produceState<DecodedImage?>(initialValue = null, path, targetWidthPx, targetHeightPx) {
value = decodeSampledImage(path, targetWidthPx, targetHeightPx)
- }
+ }.value
if (image != null) {
val previewPadding = EnsuSpacing.md.dp
val availableWidth = maxOf(0.dp, maxWidth - previewPadding - previewPadding)
val availableHeight = maxOf(0.dp, maxHeight - previewPadding - previewPadding)
val (displayWidth, displayHeight) = fittedImageSize(
- bitmapWidth = image!!.bitmap.width,
- bitmapHeight = image!!.bitmap.height,
+ bitmapWidth = image.bitmap.width,
+ bitmapHeight = image.bitmap.height,
availableWidth = availableWidth,
availableHeight = availableHeight
)
Image(
- bitmap = image!!.bitmap,
+ bitmap = image.bitmap,
contentDescription = contentDescription,
modifier = Modifier
.align(Alignment.Center)
diff --git a/android/apps/ensu/build.gradle.kts b/android/apps/ensu/build.gradle.kts
deleted file mode 100644
index 6c1cc7be57..0000000000
--- a/android/apps/ensu/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
- id("com.android.application") version "8.10.1" apply false
- id("com.android.library") version "8.10.1" apply false
- id("org.jetbrains.kotlin.android") version "2.4.20" apply false
- id("org.jetbrains.kotlin.jvm") version "2.4.20" apply false
- id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false
- id("org.jetbrains.kotlin.plugin.serialization") version "2.4.20" apply false
-}
diff --git a/android/apps/ensu/gradle.properties b/android/apps/ensu/gradle.properties
deleted file mode 100644
index f97184bebb..0000000000
--- a/android/apps/ensu/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
-android.useAndroidX=true
-kotlin.code.style=official
-android.nonTransitiveRClass=true
diff --git a/android/apps/ensu/rust/build.gradle.kts b/android/apps/ensu/rust/build.gradle.kts
index 2e0ab0c8f4..85b278464b 100644
--- a/android/apps/ensu/rust/build.gradle.kts
+++ b/android/apps/ensu/rust/build.gradle.kts
@@ -121,7 +121,6 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
- allWarningsAsErrors.set(true)
// TODO: Remove when UniFFI releases https://github.com/mozilla/uniffi-rs/pull/2949.
freeCompilerArgs.add("-Xwarning-level=UNUSED_EXPRESSION:warning")
}
diff --git a/android/apps/ensu/settings.gradle.kts b/android/apps/ensu/settings.gradle.kts
deleted file mode 100644
index 1c488c3d99..0000000000
--- a/android/apps/ensu/settings.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-pluginManagement {
- repositories {
- google()
- mavenCentral()
- gradlePluginPortal()
- }
-}
-
-dependencyResolutionManagement {
- repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
- repositories {
- google()
- mavenCentral()
- maven { url = uri("https://jitpack.io") }
- // Ente's custom prebuilt ONNX Runtime AAR is resolved straight from
- // its GitHub release; its SHA-256 is pinned in
- // android/gradle/verification-metadata.xml.
- exclusiveContent {
- forRepository {
- ivy {
- name = "enteOnnxRuntimePackaging"
- url = uri("https://github.com/ente/ort-packaging/releases/download")
- patternLayout {
- artifact("ort-[revision]/[artifact]-[revision].[ext]")
- }
- metadataSources { artifact() }
- }
- }
- filter { includeGroup("io.ente.onnxruntime") }
- }
- }
-}
-
-rootProject.name = "ensu"
-include(":app", ":rust")
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 750b92eae4..34e489efe8 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -1,5 +1,7 @@
import com.android.build.api.dsl.CommonExtension
import com.ncorti.ktfmt.gradle.KtfmtExtension
+import com.ncorti.ktfmt.gradle.tasks.KtfmtBaseTask
+import dev.detekt.gradle.Detekt
import dev.detekt.gradle.extensions.DetektExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
@@ -8,15 +10,13 @@ plugins {
id("com.android.library") version "8.10.1" apply false
id("com.ncorti.ktfmt.gradle") version "0.27.0"
id("dev.detekt") version "2.0.0-alpha.6"
+ id("org.jetbrains.kotlin.android") version "2.4.20" apply false
id("org.jetbrains.kotlin.jvm") version "2.4.20" apply false
+ id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false
+ id("org.jetbrains.kotlin.plugin.serialization") version "2.4.20" apply false
}
allprojects {
- repositories {
- google()
- mavenCentral()
- }
-
apply(plugin = "com.ncorti.ktfmt.gradle")
apply(plugin = "dev.detekt")
extensions.configure<KtfmtExtension> { kotlinLangStyle() }
@@ -24,11 +24,25 @@ allprojects {
extensions.configure<DetektExtension> {
buildUponDefaultConfig.set(true)
config.setFrom(rootProject.file("detekt.yml"))
+ ignoredBuildTypes.set(listOf("release"))
+ }
+
+ tasks.withType<KtfmtBaseTask>().configureEach {
+ exclude("**/io/ente/ensu/bindings/ensu.kt")
+ }
+ tasks.withType<Detekt>().configureEach {
+ exclude("**/io/ente/ensu/bindings/ensu.kt")
}
listOf("com.android.application", "com.android.library").forEach { id ->
pluginManager.withPlugin(id) {
- extensions.configure<CommonExtension<*, *, *, *, *, *>> { lint.warningsAsErrors = true }
+ extensions.configure<CommonExtension<*, *, *, *, *, *>>("android") {
+ lint {
+ warningsAsErrors = true
+ checkTestSources = true
+ checkDependencies = true
+ }
+ }
}
}
@@ -41,7 +55,7 @@ tasks.register("lint") {
dependsOn(
allprojects.map { project ->
project.tasks.matching {
- it.name in listOf("ktfmtCheck", "detektMain", "detektTest", "lintDebug")
+ it.name in listOf("ktfmtCheck", "detekt", "detektMain", "detektTest", "lintDebug")
}
}
)
diff --git a/android/checks/gradle-order/check.py b/android/checks/gradle-order/check.py
index 753e94978b..dc42f5b4f9 100644
--- a/android/checks/gradle-order/check.py
+++ b/android/checks/gradle-order/check.py
@@ -157,10 +157,7 @@ def main(root):
errors = []
for directory, children, files in os.walk(root):
relative = Path(directory).relative_to(root)
- children[:] = sorted(
- child for child in children
- if child not in ("build", ".gradle") and relative / child != Path("apps/ensu")
- )
+ children[:] = sorted(child for child in children if child not in ("build", ".gradle"))
for name in sorted(files):
if name.endswith(".gradle.kts"):
errors.extend(check((Path(directory) / name).read_text(), relative / name))
diff --git a/android/checks/gradle-order/test.py b/android/checks/gradle-order/test.py
index 6a65314063..3bd78661fd 100644
--- a/android/checks/gradle-order/test.py
+++ b/android/checks/gradle-order/test.py
@@ -112,10 +112,10 @@ class GradleOrderTest(unittest.TestCase):
}
'''))
- def test_cli_excludes_ensu_and_generated_files(self):
+ def test_cli_excludes_build_directories(self):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
- for name in ["apps/ensu/build.gradle.kts", "build/build.gradle.kts", ".gradle/build.gradle.kts"]:
+ for name in ["build/build.gradle.kts", ".gradle/build.gradle.kts"]:
path = root / name
path.parent.mkdir(parents=True, exist_ok=True)
path.write_text('dependencies { api("z:lib:1"); api("a:lib:1") }')
diff --git a/android/detekt.yml b/android/detekt.yml
index 546b828a65..964c7b6798 100644
--- a/android/detekt.yml
+++ b/android/detekt.yml
@@ -5,6 +5,8 @@ complexity:
active: false
coroutines:
+ InjectDispatcher:
+ active: false
GlobalCoroutineUsage:
active: true
SuspendFunSwallowedCancellation:
diff --git a/android/gradle.properties b/android/gradle.properties
index c2adf04b5c..f97184bebb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,4 @@
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+android.useAndroidX=true
+kotlin.code.style=official
+android.nonTransitiveRClass=true
diff --git a/android/scripts/lint.sh b/android/scripts/lint.sh
index 34ef5d2943..df58d5d102 100755
--- a/android/scripts/lint.sh
+++ b/android/scripts/lint.sh
@@ -4,4 +4,6 @@ set -euo pipefail
cd "$(dirname "$0")/.."
python3 checks/gradle-order/check.py .
python3 checks/gradle-order/test.py
+
+(cd ../rust && cargo codegen native)
./gradlew :lint
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 0e09ed5360..7bbf84c681 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -6,7 +6,33 @@ pluginManagement {
}
}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ maven { url = uri("https://jitpack.io") }
+ // Ente's custom prebuilt ONNX Runtime AAR is resolved straight from
+ // its GitHub release; its SHA-256 is pinned in
+ // android/gradle/verification-metadata.xml.
+ exclusiveContent {
+ forRepository {
+ ivy {
+ name = "enteOnnxRuntimePackaging"
+ url = uri("https://github.com/ente/ort-packaging/releases/download")
+ patternLayout {
+ artifact("ort-[revision]/[artifact]-[revision].[ext]")
+ }
+ metadataSources { artifact() }
+ }
+ }
+ filter { includeGroup("io.ente.onnxruntime") }
+ }
+ }
+}
+
rootProject.name = "android"
-// TODO: Include Ensu in shared linting.
-includeBuild("apps/ensu")
+include(":ensu")
+project(":ensu").projectDir = file("apps/ensu")
+include(":ensu:app", ":ensu:rust")