Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(mobile): restore Android image uploads

tianma-if1d69cefc296c
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index 6bb42e85..c249e573 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -3,7 +3,7 @@
"name": "EdgeEver",
"slug": "edgeever",
"scheme": "edgeever",
- "version": "0.4.14",
+ "version": "0.4.15",
"runtimeVersion": {
"policy": "appVersion"
},
@@ -25,7 +25,7 @@
},
"android": {
"package": "org.edgeever.mobile",
- "versionCode": 20,
+ "versionCode": 21,
"adaptiveIcon": {
"backgroundColor": "#d1fae5",
"backgroundImage": "./assets/icon.png",
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index e6172661..7e4f574f 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
{
"name": "@edgeever/mobile",
- "version": "0.4.14",
+ "version": "0.4.15",
"private": true,
"type": "module",
"main": "expo-router/entry",
@@ -29,6 +29,7 @@
"expo-clipboard": "~57.0.1",
"expo-constants": "~57.0.6",
"expo-document-picker": "~57.0.1",
+ "expo-file-system": "~57.0.1",
"expo-image-manipulator": "~57.0.5",
"expo-router": "latest",
"expo-secure-store": "latest",
diff --git a/apps/mobile/src/lib/mobile-image-upload.test.ts b/apps/mobile/src/lib/mobile-image-upload.test.ts
new file mode 100644
index 00000000..7711a4de
--- /dev/null
+++ b/apps/mobile/src/lib/mobile-image-upload.test.ts
@@ -0,0 +1,52 @@
+import { expect, test } from "bun:test";
+import { prepareUploadAsset } from "./mobile-image-upload";
+
+test("uploads the compressed WebP URI when image compression is enabled", async () => {
+ const calls: Array<{ uri: string; actions: unknown[]; options: unknown }> = [];
+ const manipulateImage = async (uri: string, actions: unknown[], options: unknown) => {
+ calls.push({ uri, actions, options });
+ return calls.length === 1
+ ? { uri: "file:///cache/measured.jpg", width: 4000, height: 2000 }
+ : { uri: "file:///cache/compressed.webp", width: 2560, height: 1280 };
+ };
+
+ const result = await prepareUploadAsset(
+ { uri: "file:///cache/original.jpg", name: "photo.jpg", mimeType: "image/jpeg" },
+ true,
+ manipulateImage
+ );
+
+ expect(calls).toEqual([
+ {
+ uri: "file:///cache/original.jpg",
+ actions: [],
+ options: { compress: 1, format: "jpeg" },
+ },
+ {
+ uri: "file:///cache/original.jpg",
+ actions: [{ resize: { width: 2560 } }],
+ options: { compress: 0.82, format: "webp" },
+ },
+ ]);
+ expect(result).toEqual({
+ uri: "file:///cache/compressed.webp",
+ name: "photo.webp",
+ type: "image/webp",
+ });
+});
+
+test("keeps the original URI when image compression is disabled", async () => {
+ const result = await prepareUploadAsset(
+ { uri: "file:///cache/original.png", name: "photo.png", mimeType: "image/png" },
+ false,
+ async () => {
+ throw new Error("the image manipulator should not run");
+ }
+ );
+
+ expect(result).toEqual({
+ uri: "file:///cache/original.png",
+ name: "photo.png",
+ type: "image/png",
+ });
+});
diff --git a/apps/mobile/src/lib/mobile-image-upload.ts b/apps/mobile/src/lib/mobile-image-upload.ts
new file mode 100644
index 00000000..5d84fb24
--- /dev/null
+++ b/apps/mobile/src/lib/mobile-image-upload.ts
@@ -0,0 +1,86 @@
+const COMPRESSIBLE_IMAGE_TYPES = new Set(["image/png", "image/jpeg", "image/webp", "image/avif"]);
+const MAX_COMPRESSED_IMAGE_EDGE = 2560;
+const IMAGE_COMPRESSION_QUALITY = 0.82;
+
+export type MobileImageUploadAsset = {
+ uri: string;
+ name?: string | null;
+ mimeType?: string | null;
+};
+
+type ImageManipulationAction = { resize: { width?: number; height?: number } };
+type ImageManipulationOptions = { compress: number; format: "jpeg" | "webp" };
+type ImageManipulationResult = { uri: string; width: number; height: number };
+type ImageManipulator = (
+ uri: string,
+ actions: ImageManipulationAction[],
+ options: ImageManipulationOptions
+) => Promise<ImageManipulationResult>;
+
+export const prepareUploadAsset = async (
+ asset: MobileImageUploadAsset,
+ imageCompressionEnabled: boolean,
+ manipulateImage?: ImageManipulator
+): Promise<{ uri: string; name: string; type: string }> => {
+ const mimeType = asset.mimeType || "application/octet-stream";
+ const filename = asset.name || "upload";
+
+ if (!imageCompressionEnabled || !COMPRESSIBLE_IMAGE_TYPES.has(mimeType)) {
+ return {
+ uri: asset.uri,
+ name: filename,
+ type: mimeType,
+ };
+ }
+
+ try {
+ const manipulate = manipulateImage ?? createExpoImageManipulator();
+ const measured = await manipulate(asset.uri, [], { compress: 1, format: "jpeg" });
+ const maxEdge = Math.max(measured.width, measured.height);
+ const resizeAction = maxEdge > MAX_COMPRESSED_IMAGE_EDGE
+ ? [{ resize: getCompressedImageSize(measured.width, measured.height) }]
+ : [];
+ const compressed = await manipulate(asset.uri, resizeAction, {
+ compress: IMAGE_COMPRESSION_QUALITY,
+ format: "webp",
+ });
+
+ return {
+ uri: compressed.uri,
+ name: toCompressedImageFilename(filename),
+ type: "image/webp",
+ };
+ } catch {
+ return {
+ uri: asset.uri,
+ name: filename,
+ type: mimeType,
+ };
+ }
+};
+
+const createExpoImageManipulator = (): ImageManipulator => async (uri, actions, options) => {
+ const { manipulateAsync, SaveFormat } = await import("expo-image-manipulator");
+ return manipulateAsync(uri, actions, {
+ compress: options.compress,
+ format: options.format === "webp" ? SaveFormat.WEBP : SaveFormat.JPEG,
+ });
+};
+
+const getCompressedImageSize = (width: number, height: number) => {
+ if (width >= height) {
+ return { width: MAX_COMPRESSED_IMAGE_EDGE };
+ }
+
+ return { height: MAX_COMPRESSED_IMAGE_EDGE };
+};
+
+const toCompressedImageFilename = (filename: string) => {
+ const trimmed = filename.trim();
+
+ if (!trimmed) {
+ return "image.webp";
+ }
+
+ return trimmed.replace(/\.[^.]+$/, "") + ".webp";
+};
diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsx
index de2dfddb..609cf5c3 100644
--- a/apps/mobile/src/screens/WorkspaceScreen.tsx
+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx
@@ -2,7 +2,7 @@ import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useStat
import { keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient, type InfiniteData, type QueryClient, type UseMutationResult } from "@tanstack/react-query";
import * as Clipboard from "expo-clipboard";
import Constants from "expo-constants";
-import type { DocumentPickerAsset } from "expo-document-picker";
+import { File as ExpoFile } from "expo-file-system";
import type { MemoFilterMode, MemoSortMode } from "@edgeever/client";
import {
Archive,
@@ -116,6 +116,7 @@ import {
} from "../lib/local-mirror";
import { AccountSecurityPanel } from "./AccountSecurityModal";
import { beginEditorStartup, markStartup, recordEditorStartup } from "../lib/startup-performance";
+import { prepareUploadAsset } from "../lib/mobile-image-upload";
import EditorRuntimePrewarm from "../components/EditorRuntimePrewarm";
import { showEdgeEverKeyboard } from "../../modules/edgeever-keyboard";
import LocalTiptapEditor, { type LocalTiptapEditorRef } from "../components/LocalTiptapEditor";
@@ -201,10 +202,6 @@ const MOBILE_LOCALE_OPTIONS: Array<{ label: string; value: MobileLocalePreferenc
{ label: "简体中文", value: "zh-CN" },
{ label: "English", value: "en-US" },
];
-const COMPRESSIBLE_IMAGE_TYPES = new Set(["image/png", "image/jpeg", "image/webp", "image/avif"]);
-const MAX_COMPRESSED_IMAGE_EDGE = 2560;
-const IMAGE_COMPRESSION_QUALITY = 0.82;
-
type MobileView = "notes" | "settings";
type SettingsTab = "general" | "users" | "ai" | "account";
type MemoView = "notebook" | "trash";
@@ -2228,7 +2225,7 @@ const CreateMemoModal = ({
setImageOperation("uploading");
const uploadAsset = await prepareUploadAsset(asset, imageCompressionEnabled);
const form = new FormData();
- form.append("file", uploadAsset as unknown as Blob);
+ form.append("file", new ExpoFile(uploadAsset.uri));
const { resource } = await client!.uploadMemoResource(memo.id, form);
return {
alt: resource.filename || uploadAsset.name || "图片",
@@ -3172,7 +3169,7 @@ const ResourcesModal = ({
setUploadProgress(`正在上传第 ${index + 1}/${assets.length} 个文件...`);
const form = new FormData();
const uploadAsset = await prepareUploadAsset(asset, imageCompressionEnabled);
- form.append("file", uploadAsset as unknown as Blob);
+ form.append("file", new ExpoFile(uploadAsset.uri));
const { resource } = await client.uploadMemoResource(activeMemo.id, form);
resources.push(resource);
@@ -4425,7 +4422,7 @@ const RichEditorModal = ({
try {
const uploadAsset = await prepareUploadAsset(asset, imageCompressionEnabled);
const form = new FormData();
- form.append("file", uploadAsset as unknown as Blob);
+ form.append("file", new ExpoFile(uploadAsset.uri));
const { resource } = await client.uploadMemoResource(memo.id, form);
return {
alt: resource.filename || uploadAsset.name || "图片",
@@ -5548,45 +5545,6 @@ const appendResourceMarkdown = (
return trimmed ? `${trimmed}\n\n${markdown}\n` : `${markdown}\n`;
};
-const prepareUploadAsset = async (
- asset: DocumentPickerAsset,
- imageCompressionEnabled: boolean
-): Promise<{ uri: string; name: string; type: string }> => {
- const mimeType = asset.mimeType || "application/octet-stream";
- const filename = asset.name || "upload";
-
- if (!imageCompressionEnabled || !COMPRESSIBLE_IMAGE_TYPES.has(mimeType)) {
- return {
- uri: asset.uri,
- name: filename,
- type: mimeType,
- };
- }
-
- try {
- const { manipulateAsync, SaveFormat } = await import("expo-image-manipulator");
- const measured = await manipulateAsync(asset.uri, [], { compress: 1, format: SaveFormat.JPEG });
- const maxEdge = Math.max(measured.width, measured.height);
- const resizeAction = maxEdge > MAX_COMPRESSED_IMAGE_EDGE ? [{ resize: getCompressedImageSize(measured.width, measured.height) }] : [];
- const compressed = await manipulateAsync(asset.uri, resizeAction, {
- compress: IMAGE_COMPRESSION_QUALITY,
- format: SaveFormat.WEBP,
- });
-
- return {
- uri: compressed.uri,
- name: toCompressedImageFilename(filename),
- type: "image/webp",
- };
- } catch {
- return {
- uri: asset.uri,
- name: filename,
- type: mimeType,
- };
- }
-};
-
const createOptimisticMemo = (
memo: MemoDetail,
payload: MobileMemoUpdatePayload
@@ -5740,24 +5698,6 @@ const markdownToLocalText = (markdown: string) =>
.replace(/\s+/g, " ")
.trim();
-const getCompressedImageSize = (width: number, height: number) => {
- if (width >= height) {
- return { width: MAX_COMPRESSED_IMAGE_EDGE };
- }
-
- return { height: MAX_COMPRESSED_IMAGE_EDGE };
-};
-
-const toCompressedImageFilename = (filename: string) => {
- const trimmed = filename.trim();
-
- if (!trimmed) {
- return "image.webp";
- }
-
- return trimmed.replace(/\.[^.]+$/, "") + ".webp";
-};
-
const getTokenScopeLabel = (scope: string) => {
const labels: Record<string, string> = {
"read:notebooks": "读取笔记本",
diff --git a/bun.lock b/bun.lock
index 87de0cb9..c63693da 100644
--- a/bun.lock
+++ b/bun.lock
@@ -79,7 +79,7 @@
},
"apps/mobile": {
"name": "@edgeever/mobile",
- "version": "0.4.9",
+ "version": "0.4.15",
"dependencies": {
"@edgeever/client": "workspace:*",
"@edgeever/shared": "workspace:*",
@@ -98,6 +98,7 @@
"expo-clipboard": "~57.0.1",
"expo-constants": "~57.0.6",
"expo-document-picker": "~57.0.1",
+ "expo-file-system": "~57.0.1",
"expo-image-manipulator": "~57.0.5",
"expo-router": "latest",
"expo-secure-store": "latest",