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): receive shared images

tianma-if66a7b9b6c5ea
diff --git a/apps/ios/EdgeEver/Features/Share/ShareHandoffStore.swift b/apps/ios/EdgeEver/Features/Share/ShareHandoffStore.swift
index 751ad12e..93804bf6 100644
--- a/apps/ios/EdgeEver/Features/Share/ShareHandoffStore.swift
+++ b/apps/ios/EdgeEver/Features/Share/ShareHandoffStore.swift
@@ -5,11 +5,23 @@ import Foundation
final class ShareHandoffStore {
static let appGroupId = "group.org.edgeever.mobile"
static let payloadKey = "edgeever.share.payload"
+ static let imageDirectoryName = "incoming-share-images"
struct SharePayload: Codable, Equatable {
var text: String?
var url: String?
var title: String?
+ var imageFilename: String? = nil
+ var imageMimeType: String? = nil
+ var imageOriginalName: String? = nil
+ }
+
+ struct SharedImage: Equatable, Identifiable {
+ var fileURL: URL
+ var filename: String
+ var mimeType: String
+
+ var id: URL { fileURL }
}
func consumePending() -> [SharePayload] {
@@ -27,11 +39,50 @@ final class ShareHandoffStore {
SharePayload(
text: dict["text"] as? String,
url: dict["url"] as? String,
- title: dict["title"] as? String
+ title: dict["title"] as? String,
+ imageFilename: dict["imageFilename"] as? String,
+ imageMimeType: dict["imageMimeType"] as? String,
+ imageOriginalName: dict["imageOriginalName"] as? String
)
}
}
+ func sharedImages(from payloads: [SharePayload]) -> [SharedImage] {
+ guard let container = FileManager.default.containerURL(
+ forSecurityApplicationGroupIdentifier: Self.appGroupId
+ ) else { return [] }
+ let directory = container.appendingPathComponent(Self.imageDirectoryName, isDirectory: true)
+ return Self.sharedImages(from: payloads, directory: directory)
+ }
+
+ static func sharedImages(from payloads: [SharePayload], directory: URL) -> [SharedImage] {
+ payloads.compactMap { payload in
+ guard let storedName = payload.imageFilename?.trimmingCharacters(in: .whitespacesAndNewlines),
+ !storedName.isEmpty,
+ storedName != ".",
+ storedName != "..",
+ (storedName as NSString).lastPathComponent == storedName
+ else { return nil }
+ let safeDirectory = directory.standardizedFileURL
+ let fileURL = safeDirectory.appendingPathComponent(storedName, isDirectory: false).standardizedFileURL
+ guard fileURL.deletingLastPathComponent() == safeDirectory else { return nil }
+ guard FileManager.default.fileExists(atPath: fileURL.path) else { return nil }
+ let originalName = payload.imageOriginalName?
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ let mimeType = payload.imageMimeType?
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ return SharedImage(
+ fileURL: fileURL,
+ filename: originalName.flatMap { $0.isEmpty ? nil : $0 } ?? storedName,
+ mimeType: mimeType.flatMap { $0.isEmpty ? nil : $0 } ?? "image/jpeg"
+ )
+ }
+ }
+
+ func removeImage(_ image: SharedImage) {
+ try? FileManager.default.removeItem(at: image.fileURL)
+ }
+
static func writeForExtension(_ payloads: [SharePayload]) {
guard let defaults = UserDefaults(suiteName: appGroupId) else { return }
guard let data = try? EdgeEverJSON.encoder.encode(payloads) else { return }
diff --git a/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift b/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift
index cf7deea4..45ca1033 100644
--- a/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift
+++ b/apps/ios/EdgeEver/Features/Workspace/MemoEditView.swift
@@ -21,6 +21,7 @@ struct MemoEditView: View {
@Environment(\.colorScheme) private var colorScheme
let mode: MemoEditMode
+ var initialSharedImages: [ShareHandoffStore.SharedImage] = []
/// When set (edit-from-detail), close by popping to the list under the cover first —
/// never `dismiss()` onto a still-pushed detail page.
var onLeaveToList: (() -> Void)? = nil
@@ -47,6 +48,7 @@ struct MemoEditView: View {
@State private var aiSelection: AiEditorSelection?
@State private var showEmptyAiSelectionAlert = false
@State private var aiUndoToken: UUID?
+ @State private var didImportSharedImages = false
private var title: String { get { viewModel.title } nonmutating set { viewModel.title = newValue } }
private var tagsText: String { get { viewModel.tagsText } nonmutating set { viewModel.tagsText = newValue } }
@@ -273,6 +275,7 @@ struct MemoEditView: View {
// One open-edit focus only (SharedTipTapRuntime also focuses once per document).
SharedTipTapRuntime.editor.focusEnd()
}
+ await importInitialSharedImagesIfNeeded()
}
.onDisappear {
viewModel.cancelScheduledSave()
@@ -612,7 +615,7 @@ struct MemoEditView: View {
error = message
showUploadError = true
case .picked(let data, let filename):
- Task { await insertImageData(data, filename: filename) }
+ Task { _ = await insertImageData(data, filename: filename) }
}
}
@@ -1071,7 +1074,7 @@ struct MemoEditView: View {
}
/// Upload bytes from the system PHPicker and insert into TipTap.
- private func insertImageData(_ data: Data, filename: String) async {
+ private func insertImageData(_ data: Data, filename: String) async -> Bool {
let succeeded = await viewModel.performUpload {
NSLog("MemoEditView insertImageData: start bytes=%d name=%@", data.count, filename)
let compress = env.preferences.useCompression
@@ -1147,6 +1150,25 @@ struct MemoEditView: View {
showUploadError = true
NSLog("MemoEditView insertImageData failed: %@", error ?? "unknown")
}
+ return succeeded
+ }
+
+ private func importInitialSharedImagesIfNeeded() async {
+ guard !didImportSharedImages, !initialSharedImages.isEmpty else { return }
+ didImportSharedImages = true
+ for image in initialSharedImages {
+ do {
+ let data = try Data(contentsOf: image.fileURL)
+ let succeeded = await insertImageData(data, filename: image.filename)
+ env.shareHandoff.removeImage(image)
+ guard succeeded else { return }
+ } catch {
+ env.shareHandoff.removeImage(image)
+ self.error = error.localizedDescription
+ showUploadError = true
+ return
+ }
+ }
}
/// When compression is off, still normalize HEIC → JPEG for reliable upload mime.
diff --git a/apps/ios/EdgeEver/Features/Workspace/WorkspaceView.swift b/apps/ios/EdgeEver/Features/Workspace/WorkspaceView.swift
index a163afac..b4eef797 100644
--- a/apps/ios/EdgeEver/Features/Workspace/WorkspaceView.swift
+++ b/apps/ios/EdgeEver/Features/Workspace/WorkspaceView.swift
@@ -14,6 +14,7 @@ struct WorkspaceView: View {
@State private var showSettings = false
@State private var showNewNote = false
@State private var createSeed: CreateMemoSeed?
+ @State private var createSharedImages: [ShareHandoffStore.SharedImage] = []
@State private var showCreateChoice = false
@State private var showTemplatePicker = false
@State private var createLongPressConsumed = false
@@ -93,6 +94,7 @@ struct WorkspaceView: View {
notebookId: store.selectedNotebookId ?? store.notebooks.first?.id ?? "",
seed: createSeed
),
+ initialSharedImages: createSharedImages,
onCreateFinished: { memoId in
// Prime list + bounce **before** dismiss so settle runs under/with the cover,
// not half a second after the list is already static.
@@ -103,6 +105,7 @@ struct WorkspaceView: View {
)
.onDisappear {
createSeed = nil
+ createSharedImages = []
// Safety refresh if create finished without callback (e.g. swipe-dismiss empty).
store.reload(env: env)
}
@@ -669,9 +672,13 @@ struct WorkspaceView: View {
.animation(Motion.search, value: env.bootstrapProgress != nil)
}
- private func openCreateNote(seed: CreateMemoSeed? = nil) {
+ private func openCreateNote(
+ seed: CreateMemoSeed? = nil,
+ sharedImages: [ShareHandoffStore.SharedImage] = []
+ ) {
guard !store.notebooks.isEmpty else { return }
createSeed = seed
+ createSharedImages = sharedImages
showNewNote = true
}
@@ -683,6 +690,28 @@ struct WorkspaceView: View {
private func consumeShare() {
let payloads = env.shareHandoff.consumePending()
guard !payloads.isEmpty else { return }
+ let sharedImages = env.shareHandoff.sharedImages(from: payloads)
+ if !sharedImages.isEmpty {
+ guard !store.notebooks.isEmpty else {
+ sharedImages.forEach(env.shareHandoff.removeImage)
+ shareImportAlert = ShareImportAlert(
+ title: env.preferences.t("无法保存图片", en: "Unable to save images"),
+ message: env.preferences.t("请先在 EdgeEver 中创建一个笔记本。", en: "Create a notebook in EdgeEver first.")
+ )
+ return
+ }
+ openCreateNote(
+ seed: CreateMemoSeed(
+ title: sharedImages.count == 1
+ ? env.preferences.t("分享的图片", en: "Shared image")
+ : env.preferences.t("分享的图片(\(sharedImages.count) 张)", en: "Shared images (\(sharedImages.count))"),
+ contentMarkdown: "",
+ tagsText: ""
+ ),
+ sharedImages: sharedImages
+ )
+ return
+ }
guard let sourceURL = WebClipper.sharedWebURL(from: payloads) else {
shareImportAlert = ShareImportAlert(
title: env.preferences.t("无法剪藏", en: "Unable to clip"),
diff --git a/apps/ios/ShareExtension/Info.plist b/apps/ios/ShareExtension/Info.plist
index 75f02378..beb00f67 100644
--- a/apps/ios/ShareExtension/Info.plist
+++ b/apps/ios/ShareExtension/Info.plist
@@ -24,6 +24,8 @@
<dict>
<key>NSExtensionActivationRule</key>
<dict>
+ <key>NSExtensionActivationSupportsImageWithMaxCount</key>
+ <integer>10</integer>
<key>NSExtensionActivationSupportsText</key>
<true/>
<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
diff --git a/apps/ios/ShareExtension/ShareViewController.swift b/apps/ios/ShareExtension/ShareViewController.swift
index d94924f7..1ec25b1c 100644
--- a/apps/ios/ShareExtension/ShareViewController.swift
+++ b/apps/ios/ShareExtension/ShareViewController.swift
@@ -1,10 +1,12 @@
import UIKit
import UniformTypeIdentifiers
-/// Lightweight share extension: text + web URL → App Group → open main app.
+/// Lightweight share extension: text, web URLs, and images → App Group → open main app.
class ShareViewController: UIViewController {
private let appGroupId = "group.org.edgeever.mobile"
private let hostScheme = "edgeever"
+ private let payloadKey = "edgeever.share.payload"
+ private let imageDirectoryName = "incoming-share-images"
override func viewDidLoad() {
super.viewDidLoad()
@@ -17,34 +19,36 @@ class ShareViewController: UIViewController {
extensionContext?.completeRequest(returningItems: nil)
return
}
- var text: String?
- var urlString: String?
- var title: String?
+ var payload: [[String: Any]] = []
for item in items {
- title = item.attributedContentText?.string
+ let title = item.attributedContentText?.string
for provider in item.attachments ?? [] {
- if provider.hasItemConformingToTypeIdentifier(UTType.url.identifier),
+ if provider.hasItemConformingToTypeIdentifier(UTType.image.identifier),
+ let image = try? await persistImage(from: provider)
+ {
+ payload.append([
+ "imageFilename": image.storageFilename,
+ "imageMimeType": image.mimeType,
+ "imageOriginalName": image.originalName,
+ "title": title as Any,
+ ])
+ } else if provider.hasItemConformingToTypeIdentifier(UTType.url.identifier),
let url = try? await provider.loadItem(forTypeIdentifier: UTType.url.identifier) as? URL
{
- urlString = url.absoluteString
+ payload.append(["url": url.absoluteString, "title": title as Any])
} else if provider.hasItemConformingToTypeIdentifier(UTType.plainText.identifier),
let str = try? await provider.loadItem(forTypeIdentifier: UTType.plainText.identifier) as? String
{
- text = str
+ payload.append(["text": str, "title": title as Any])
}
}
}
- let payload: [[String: Any]] = [[
- "text": text as Any,
- "url": urlString as Any,
- "title": title as Any,
- ]]
if let data = try? JSONSerialization.data(withJSONObject: payload),
let defaults = UserDefaults(suiteName: appGroupId)
{
- defaults.set(data, forKey: "edgeever.share.payload")
+ defaults.set(data, forKey: payloadKey)
}
if let url = URL(string: "\(hostScheme)://share") {
@@ -55,4 +59,60 @@ class ShareViewController: UIViewController {
}
extensionContext?.completeRequest(returningItems: nil)
}
+
+ private func persistImage(from provider: NSItemProvider) async throws -> (
+ storageFilename: String,
+ originalName: String,
+ mimeType: String
+ ) {
+ guard let container = FileManager.default.containerURL(
+ forSecurityApplicationGroupIdentifier: appGroupId
+ ) else {
+ throw CocoaError(.fileNoSuchFile)
+ }
+ let directory = container.appendingPathComponent(imageDirectoryName, isDirectory: true)
+ try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+
+ let typeIdentifier = provider.registeredTypeIdentifiers.first(where: {
+ UTType($0)?.conforms(to: .image) == true
+ }) ?? UTType.image.identifier
+ let type = UTType(typeIdentifier)
+ let preferredExtension = type?.preferredFilenameExtension ?? "jpg"
+ let mimeType = type?.preferredMIMEType ?? "image/jpeg"
+ let suggested = ((provider.suggestedName ?? "shared-image") as NSString).lastPathComponent
+ let originalName = (suggested as NSString).pathExtension.isEmpty
+ ? "\(suggested).\(preferredExtension)"
+ : suggested
+ let storageFilename = "\(UUID().uuidString).\(preferredExtension)"
+ let destination = directory.appendingPathComponent(storageFilename, isDirectory: false)
+
+ do {
+ try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
+ provider.loadFileRepresentation(forTypeIdentifier: typeIdentifier) { source, error in
+ guard let source else {
+ continuation.resume(throwing: error ?? CocoaError(.fileReadUnknown))
+ return
+ }
+ do {
+ try FileManager.default.copyItem(at: source, to: destination)
+ continuation.resume(returning: ())
+ } catch {
+ continuation.resume(throwing: error)
+ }
+ }
+ }
+ } catch {
+ let data = try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Data, Error>) in
+ provider.loadDataRepresentation(forTypeIdentifier: typeIdentifier) { data, error in
+ if let data, !data.isEmpty {
+ continuation.resume(returning: data)
+ } else {
+ continuation.resume(throwing: error ?? CocoaError(.fileReadUnknown))
+ }
+ }
+ }
+ try data.write(to: destination, options: .atomic)
+ }
+ return (storageFilename, originalName, mimeType)
+ }
}
diff --git a/apps/ios/Tests/EdgeEverTests/WebClipperTests.swift b/apps/ios/Tests/EdgeEverTests/WebClipperTests.swift
index 9881ccdf..f2182b82 100644
--- a/apps/ios/Tests/EdgeEverTests/WebClipperTests.swift
+++ b/apps/ios/Tests/EdgeEverTests/WebClipperTests.swift
@@ -2,6 +2,44 @@ import XCTest
@testable import EdgeEver
final class WebClipperTests: XCTestCase {
+ @MainActor
+ func testSharedImagesResolveOnlyFilesInsideHandoffDirectory() throws {
+ let directory = FileManager.default.temporaryDirectory
+ .appendingPathComponent("edgeever-share-test-\(UUID().uuidString)", isDirectory: true)
+ try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+ defer { try? FileManager.default.removeItem(at: directory) }
+ let imageURL = directory.appendingPathComponent("stored-image.jpg")
+ try Data([0xFF, 0xD8, 0xFF]).write(to: imageURL)
+
+ let payloads = [
+ ShareHandoffStore.SharePayload(
+ text: nil,
+ url: nil,
+ title: nil,
+ imageFilename: "stored-image.jpg",
+ imageMimeType: "image/jpeg",
+ imageOriginalName: "知乎图片.jpg"
+ ),
+ ShareHandoffStore.SharePayload(
+ text: nil,
+ url: nil,
+ title: nil,
+ imageFilename: "..",
+ imageMimeType: "image/jpeg",
+ imageOriginalName: "unsafe.jpg"
+ ),
+ ]
+
+ XCTAssertEqual(
+ ShareHandoffStore.sharedImages(from: payloads, directory: directory),
+ [ShareHandoffStore.SharedImage(
+ fileURL: imageURL,
+ filename: "知乎图片.jpg",
+ mimeType: "image/jpeg"
+ )]
+ )
+ }
+
func testSharedWebURLFindsURLInsideText() {
let payloads = [ShareHandoffStore.SharePayload(
text: "Read this https://example.com/articles/one?from=share today",
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index 53cecac0..b7f89fc6 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -86,10 +86,12 @@
"android": {
"enabled": true,
"multipleShareMimeTypes": [
- "text/plain"
+ "text/plain",
+ "image/*"
],
"singleShareMimeTypes": [
- "text/plain"
+ "text/plain",
+ "image/*"
]
}
}
diff --git a/apps/mobile/app/index.tsx b/apps/mobile/app/index.tsx
index 724a4f57..10cc15de 100644
--- a/apps/mobile/app/index.tsx
+++ b/apps/mobile/app/index.tsx
@@ -16,7 +16,19 @@ const WorkspaceScreen = lazy(() =>
export default function IndexScreen() {
const { isLoading, session } = useSession();
const isRestoringCache = useIsRestoring();
- const { clearSharedPayloads, sharedPayloads } = useIncomingShare();
+ const {
+ clearSharedPayloads,
+ error: incomingShareError,
+ isResolving: isResolvingIncomingShare,
+ resolvedSharedPayloads,
+ sharedPayloads,
+ } = useIncomingShare();
+ const incomingSharePayloads = resolvedSharedPayloads.length > 0
+ ? resolvedSharedPayloads
+ : sharedPayloads;
+ const isWaitingForBinaryShareResolution = !incomingShareError
+ && resolvedSharedPayloads.length === 0
+ && sharedPayloads.some((payload) => payload.shareType !== "text" && payload.shareType !== "url");
useEffect(() => {
if (!isLoading && !isRestoringCache) {
@@ -32,7 +44,9 @@ export default function IndexScreen() {
return session ? (
<Suspense fallback={<StartupPlaceholder showBrand />}>
<WorkspaceScreen
- incomingSharePayloads={sharedPayloads}
+ incomingShareError={incomingShareError}
+ incomingShareIsResolving={isResolvingIncomingShare || isWaitingForBinaryShareResolution}
+ incomingSharePayloads={incomingSharePayloads}
onIncomingShareHandled={clearSharedPayloads}
/>
</Suspense>
diff --git a/apps/mobile/src/lib/mobile-web-clip.test.ts b/apps/mobile/src/lib/mobile-web-clip.test.ts
index 49e92ff9..05ef7258 100644
--- a/apps/mobile/src/lib/mobile-web-clip.test.ts
+++ b/apps/mobile/src/lib/mobile-web-clip.test.ts
@@ -3,12 +3,31 @@ import {
buildMobileWebClipDraft,
buildMobileWebClipDraftFromRenderedPage,
extractPageTitle,
+ getSharedImages,
getSharedWebUrl,
htmlToMarkdown,
isWeChatArticleUrl,
} from "./mobile-web-clip";
describe("mobile web clip", () => {
+ test("normalizes resolved images shared by another Android app", () => {
+ expect(getSharedImages([
+ {
+ contentMimeType: "image/webp",
+ contentType: "image",
+ contentUri: "file:///cache/zhihu-image.webp",
+ mimeType: "image/*",
+ originalName: "zhihu-image.webp",
+ shareType: "image",
+ value: "content://com.zhihu.android/image/42",
+ },
+ ])).toEqual([{
+ mimeType: "image/webp",
+ name: "zhihu-image.webp",
+ uri: "file:///cache/zhihu-image.webp",
+ }]);
+ });
+
test("extracts a WeChat URL embedded in shared text", () => {
expect(getSharedWebUrl([
{ shareType: "text", value: "一篇文章\nhttps://mp.weixin.qq.com/s/abc123" },
diff --git a/apps/mobile/src/lib/mobile-web-clip.ts b/apps/mobile/src/lib/mobile-web-clip.ts
index efbfc0f1..8f933f89 100644
--- a/apps/mobile/src/lib/mobile-web-clip.ts
+++ b/apps/mobile/src/lib/mobile-web-clip.ts
@@ -1,9 +1,19 @@
export type MobileSharedPayload = {
+ contentMimeType?: string | null;
+ contentType?: string | null;
+ contentUri?: string | null;
mimeType?: string;
+ originalName?: string | null;
shareType?: string;
value?: string;
};
+export type MobileSharedImage = {
+ mimeType: string;
+ name: string;
+ uri: string;
+};
+
export type MobileWebClipDraft = {
contentMarkdown: string;
sourceUrl: string;
@@ -74,6 +84,22 @@ export const getSharedWebUrl = (payloads: MobileSharedPayload[]) => {
return null;
};
+export const getSharedImages = (payloads: MobileSharedPayload[]): MobileSharedImage[] =>
+ payloads.flatMap((payload, index) => {
+ const mimeType = payload.contentMimeType?.trim() || payload.mimeType?.trim() || "";
+ const isImage = payload.contentType === "image" || payload.shareType === "image" || mimeType.startsWith("image/");
+ const uri = payload.contentUri?.trim() || payload.value?.trim() || "";
+ if (!isImage || !uri) {
+ return [];
+ }
+
+ return [{
+ mimeType: mimeType || "image/jpeg",
+ name: payload.originalName?.trim() || `shared-image-${index + 1}`,
+ uri,
+ }];
+ });
+
export const isWeChatArticleUrl = (value: string) => {
try {
const url = new URL(value);
diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsx
index 20cc3a1b..f9ba65bf 100644
--- a/apps/mobile/src/screens/WorkspaceScreen.tsx
+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx
@@ -110,7 +110,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 { prepareUploadAsset, type MobileImageUploadAsset } from "../lib/mobile-image-upload";
import MobileWebClipCapture from "../components/MobileWebClipCapture";
import LocalTiptapEditor, { type LocalTiptapEditorRef } from "../components/LocalTiptapEditor";
import { SAFE_DOM_WEBVIEW_PROPS } from "../lib/mobile-dom";
@@ -127,9 +127,11 @@ import { getMobileMarkdownFenceLanguage, trimMobileMarkdownFenceContent } from "
import {
buildMobileWebClipDraft,
buildMobileWebClipDraftFromRenderedPage,
+ getSharedImages,
getSharedWebUrl,
isWeChatArticleUrl,
type MobileRenderedWebPage,
+ type MobileSharedImage,
type MobileSharedPayload,
type MobileWebClipDraft,
} from "../lib/mobile-web-clip";
@@ -219,9 +221,13 @@ type RichEditingSession = {
type MobileMemoUpdateMutation = UseMutationResult<MemoDetail, Error, { memo: MemoDetail; payload: MobileMemoUpdatePayload }>;
export const WorkspaceScreen = ({
+ incomingShareError = null,
+ incomingShareIsResolving = false,
incomingSharePayloads = [],
onIncomingShareHandled,
}: {
+ incomingShareError?: Error | null;
+ incomingShareIsResolving?: boolean;
incomingSharePayloads?: MobileSharedPayload[];
onIncomingShareHandled?: () => void;
}) => {
@@ -249,6 +255,7 @@ export const WorkspaceScreen = ({
const [templatePickerOpen, setTemplatePickerOpen] = useState(false);
const [incomingClipDraft, setIncomingClipDraft] = useState<MobileWebClipDraft | null>(null);
const [incomingClipCaptureUrl, setIncomingClipCaptureUrl] = useState<string | null>(null);
+ const [incomingShareImages, setIncomingShareImages] = useState<MobileSharedImage[]>([]);
const [isImportingShare, setIsImportingShare] = useState(false);
const [notesActionsOpen, setNotesActionsOpen] = useState(false);
const [notebookPickerOpen, setNotebookPickerOpen] = useState(false);
@@ -264,6 +271,7 @@ export const WorkspaceScreen = ({
onIncomingShareHandledRef.current = onIncomingShareHandled;
const debouncedSearchText = useDebouncedValue(searchText.trim(), 250);
const incomingShareUrl = useMemo(() => getSharedWebUrl(incomingSharePayloads), [incomingSharePayloads]);
+ const sharedImages = useMemo(() => getSharedImages(incomingSharePayloads), [incomingSharePayloads]);
const handleMemoIdRemapped = useCallback((temporaryId: string, memo: MemoDetail) => {
setSelectedMemoId((current) => current === temporaryId ? memo.id : current);
setSelectedMemoIds((current) => {
@@ -614,6 +622,7 @@ export const WorkspaceScreen = ({
setSelectionMode(false);
setSelectedMemoIds(new Set());
setIncomingClipDraft(null);
+ setIncomingShareImages([]);
setCreateSeed(seed);
setCreateOpen(true);
}, []);
@@ -666,11 +675,58 @@ export const WorkspaceScreen = ({
}, [finishIncomingShare, incomingClipCaptureUrl, openIncomingClipDraft]);
useEffect(() => {
+ if (incomingShareIsResolving) {
+ return;
+ }
+
+ if (incomingShareError && sharedImages.some((image) => !image.uri.startsWith("file:"))) {
+ if (processedShareUrlRef.current !== "invalid-binary-share") {
+ processedShareUrlRef.current = "invalid-binary-share";
+ Alert.alert("无法读取分享图片", incomingShareError.message || "请重新分享后再试。");
+ onIncomingShareHandledRef.current?.();
+ }
+ return;
+ }
+
+ if (sharedImages.length > 0) {
+ const shareKey = `images:${sharedImages.map((image) => image.uri).join("|")}`;
+ if (processedShareUrlRef.current === shareKey) {
+ return;
+ }
+ if (notebooks.length === 0) {
+ if (notebooksQuery.isSuccess) {
+ processedShareUrlRef.current = shareKey;
+ Alert.alert("无法保存图片", "请先在 EdgeEver 中创建一个笔记本。");
+ onIncomingShareHandledRef.current?.();
+ }
+ return;
+ }
+
+ processedShareUrlRef.current = shareKey;
+ beginEditorStartup();
+ setSelectedMemoId(null);
+ setIncomingClipDraft(null);
+ setIncomingShareImages(sharedImages);
+ setCreateSeed({
+ contentMarkdown: "",
+ tagsText: "",
+ title: sharedImages.length === 1 ? "分享的图片" : `分享的图片(${sharedImages.length} 张)`,
+ });
+ setActiveView("notes");
+ setMemoView("notebook");
+ setCreateOpen(true);
+ onIncomingShareHandledRef.current?.();
+ return;
+ }
+
const sourceUrl = incomingShareUrl;
if (!sourceUrl) {
if (incomingSharePayloads.length > 0 && processedShareUrlRef.current !== "invalid-share") {
processedShareUrlRef.current = "invalid-share";
- Alert.alert("无法剪藏", "分享内容里没有可识别的网页链接。");
+ Alert.alert(
+ "无法读取分享内容",
+ incomingShareError?.message || "分享内容里没有可识别的网页链接或图片。",
+ );
onIncomingShareHandledRef.current?.();
return;
}
@@ -721,11 +777,14 @@ export const WorkspaceScreen = ({
active = false;
};
}, [
+ incomingShareError,
+ incomingShareIsResolving,
incomingSharePayloads.length,
incomingShareUrl,
notebooks.length,
notebooksQuery.isSuccess,
openIncomingClipDraft,
+ sharedImages,
]);
useEffect(() => {
@@ -1194,10 +1253,12 @@ export const WorkspaceScreen = ({
defaultNotebookId={createMemoNotebookId}
imageCompressionEnabled={imageCompressionEnabled}
initialDraft={incomingClipDraft ?? createSeed}
+ initialSharedImages={incomingShareImages}
notebooks={notebooks}
onCreated={() => {
setCreateOpen(false);
setIncomingClipDraft(null);
+ setIncomingShareImages([]);
setCreateSeed(null);
setActiveView("notes");
setMemoView("notebook");
@@ -1206,6 +1267,7 @@ export const WorkspaceScreen = ({
onDismiss={() => {
setCreateOpen(false);
setIncomingClipDraft(null);
+ setIncomingShareImages([]);
setCreateSeed(null);
}}
onQueued={runForcedSync}
@@ -1684,6 +1746,7 @@ const CreateMemoModal = ({
defaultNotebookId,
imageCompressionEnabled,
initialDraft,
+ initialSharedImages = [],
notebooks,
onCreated,
onDismiss,
@@ -1696,6 +1759,7 @@ const CreateMemoModal = ({
defaultNotebookId: string;
imageCompressionEnabled: boolean;
initialDraft?: MobileCreateMemoSeed | MobileWebClipDraft | null;
+ initialSharedImages?: MobileSharedImage[];
notebooks: Notebook[];
onCreated: (memo: MemoDetail) => void;
onDismiss: () => void;
@@ -1734,6 +1798,7 @@ const CreateMemoModal = ({
const [editorReady, setEditorReady] = useState(false);
const [imageOperation, setImageOperation] = useState<"idle" | "creating" | "uploading">("idle");
const imageOperationRef = useRef(imageOperation);
+ const sharedImagesHandledRef = useRef(false);
const createPendingRef = useRef(false);
const [resourceTarget, setResourceTarget] = useState<MobileResourceTarget | null>(null);
const { pickUploadAsset, uploadSourcePicker } = useMobileEditorUploadAsset();
@@ -2038,10 +2103,9 @@ const CreateMemoModal = ({
return response.memo;
};
- const pickAndUploadImage = async () => {
+ const uploadImageAsset = async (asset: MobileImageUploadAsset | null) => {
let uploadId: string | null = null;
try {
- const asset = await pickUploadAsset();
if (!asset) {
return;
}
@@ -2066,6 +2130,23 @@ const CreateMemoModal = ({
}
};
+ const pickAndUploadImage = async () => {
+ const asset = await pickUploadAsset();
+ await uploadImageAsset(asset);
+ };
+
+ useEffect(() => {
+ if (!editorReady || sharedImagesHandledRef.current || initialSharedImages.length === 0) {
+ return;
+ }
+ sharedImagesHandledRef.current = true;
+ void (async () => {
+ for (const image of initialSharedImages) {
+ await uploadImageAsset(image);
+ }
+ })();
+ }, [editorReady, initialSharedImages]);
+
const markDirty = () => {
userEditedSinceOpenRef.current = true;
draftVersionRef.current += 1;