feat(drag-drop): enhance error handling and share intent management in Android plugin

Author: tonyantony300

frontend/src/components/sender/PairedDevicesPanel.tsx

@@ -94,6 +94,7 @@ export function PairedDevicesPanel({
 					const Icon = deviceTypeIcon(device.device_type)
 					const inviteStatus = pairedInviteStatus[device.endpoint_id]
 					const isActive = isPairedDeviceActive(device)
+					const isOnline = device.online
 					const isSending = inviteStatus === 'sending'
 					const anotherDeviceSelected = Object.entries(
 						pairedInviteStatus
@@ -107,6 +108,7 @@ export function PairedDevicesPanel({
 						!hasTicket ||
 						isSending ||
 						!isActive ||
+						!isOnline ||
 						anotherDeviceSelected ||
 						inviteStatus === 'sent'
 					return (

frontend/src/hooks/useDragDrop.ts

@@ -167,7 +167,8 @@ export function useDragDrop(
 			startCopy: (
 				onStart: (path: string, size: bigint) => void,
 				onEvent: (event: { progress: number }) => void,
-				onComplete: (path: string) => void
+				onComplete: (path: string) => void,
+				onError?: (message: string) => void
 			) => Promise<{ cancelJob: () => Promise<void> } | null>,
 			pathType: 'file' | 'directory'
 		) => {
@@ -188,6 +189,18 @@ export function useDragDrop(
 					setCopyTotalBytes('0')
 					cancelRef.current = null
 					await triggerFilesSelect([path], pathType)
+				},
+				(message) => {
+					setIsCopying(false)
+					setCopyProgress(0)
+					setCopyFileName('')
+					setCopyTotalBytes('0')
+					cancelRef.current = null
+					showAlert(
+						t('common:errors.fileDialogFailed'),
+						message,
+						'error'
+					)
 				}
 			)
 
@@ -197,7 +210,7 @@ export function useDragDrop(
 
 			return Boolean(handler)
 		},
-		[triggerFilesSelect]
+		[showAlert, t, triggerFilesSelect]
 	)
 
 	const consumeAndroidShare = useCallback(async () => {
@@ -437,6 +450,7 @@ export function useDragDrop(
 
 		let disposed = false
 		let unlistenShare: (() => void) | undefined
+		const retryTimers: number[] = []
 
 		const run = () => {
 			if (!disposed) {
@@ -452,13 +466,20 @@ export function useDragDrop(
 			}
 			// Cold start: intent may already be pending before listeners registered.
 			run()
+			// Native load() posts shareReceived after WebView is ready; these retries
+			// cover the case where the first consume ran before the URI was stashed.
+			retryTimers.push(window.setTimeout(run, 400))
+			retryTimers.push(window.setTimeout(run, 1200))
 		}
 
 		void setup()
 
 		return () => {
 			disposed = true
 			unlistenShare?.()
+			for (const id of retryTimers) {
+				window.clearTimeout(id)
+			}
 		}
 	}, [])
 

frontend/src/hooks/useSender.ts

@@ -947,7 +947,7 @@ export function useSender(): UseSenderReturn {
 			pairedDevices.find((d) => d.endpoint_id === endpointId) ?? null
 		const deviceName =
 			device?.display_name ?? t('common:sender.pairedDevices.unknownPeer')
-		if (device && !isPairedDeviceActive(device)) {
+		if (device && (!isPairedDeviceActive(device) || !device.online)) {
 			return false
 		}
 		incrementPairedSendCount(endpointId)

frontend/src/plugins/nativeUtils.ts

@@ -10,6 +10,7 @@ export type CopyProgress = {
 	totalBytes: string
 	progress: number
 	cachedPath?: string
+	error?: string
 }
 
 export class FileSelectedHandler {
@@ -54,16 +55,21 @@ type CopyHandlers = {
 	onStart: (path: string, size: bigint) => void
 	onEvent: (event: CopyProgress) => void
 	onComplete: (path: string) => void
+	onError?: (message: string) => void
 }
 
 function bindCopyChannel(
 	channel: { onmessage: (event: CopyProgress) => void },
 	handlers: CopyHandlers
 ) {
 	channel.onmessage = (event: CopyProgress) => {
-		if (event.progress === 0 && event.cachedPath) {
-			handlers.onStart(event.cachedPath, BigInt(event.totalBytes))
-		} else if (event.progress === 1 && event.cachedPath) {
+		if (event.error) {
+			handlers.onError?.(event.error)
+			return
+		}
+		if (event.cachedPath && (event.progress === 0 || event.progress === 0.0)) {
+			handlers.onStart(event.cachedPath, BigInt(event.totalBytes || '0'))
+		} else if (event.cachedPath && event.progress >= 1) {
 			handlers.onComplete(event.cachedPath)
 		} else {
 			handlers.onEvent(event)
@@ -74,7 +80,8 @@ function bindCopyChannel(
 export async function selectSendDocument(
 	onStart: (path: string, size: bigint) => void,
 	onEvent: (event: CopyProgress) => void,
-	onComplete: (path: string) => void
+	onComplete: (path: string) => void,
+	onError?: (message: string) => void
 ): Promise<FileSelectedHandler | null> {
 	if (!IS_TAURI) {
 		const selected = await openDialog({ multiple: true, directory: false })
@@ -89,7 +96,7 @@ export async function selectSendDocument(
 
 	const { Channel } = await import('@tauri-apps/api/core')
 	const channel = new Channel<CopyProgress>()
-	bindCopyChannel(channel, { onStart, onEvent, onComplete })
+	bindCopyChannel(channel, { onStart, onEvent, onComplete, onError })
 	const response = await invoke<boolean | undefined>(
 		'plugin:native-utils|select_send_document',
 		{
@@ -103,7 +110,8 @@ export async function selectSendDocument(
 export async function selectSendFolder(
 	onStart: (path: string, size: bigint) => void,
 	onEvent: (event: CopyProgress) => void,
-	onComplete: (path: string) => void
+	onComplete: (path: string) => void,
+	onError?: (message: string) => void
 ): Promise<FileSelectedHandler | null> {
 	if (!IS_TAURI) {
 		const selected = await openDialog({ multiple: false, directory: true })
@@ -117,7 +125,7 @@ export async function selectSendFolder(
 
 	const { Channel } = await import('@tauri-apps/api/core')
 	const channel = new Channel<CopyProgress>()
-	bindCopyChannel(channel, { onStart, onEvent, onComplete })
+	bindCopyChannel(channel, { onStart, onEvent, onComplete, onError })
 	const response = await invoke<boolean>(
 		'plugin:native-utils|select_send_folder',
 		{
@@ -132,13 +140,14 @@ export async function selectSendFolder(
 export async function consumeShareIntent(
 	onStart: (path: string, size: bigint) => void,
 	onEvent: (event: CopyProgress) => void,
-	onComplete: (path: string) => void
+	onComplete: (path: string) => void,
+	onError?: (message: string) => void
 ): Promise<FileSelectedHandler | null> {
 	if (!IS_TAURI) return null
 
 	const { Channel } = await import('@tauri-apps/api/core')
 	const channel = new Channel<CopyProgress>()
-	bindCopyChannel(channel, { onStart, onEvent, onComplete })
+	bindCopyChannel(channel, { onStart, onEvent, onComplete, onError })
 	const response = await invoke<boolean | undefined>(
 		'plugin:native-utils|consume_share_intent',
 		{ channel }

scripts/package-windows-portable.js

@@ -111,6 +111,48 @@ function copyDir(src, dest) {
 	}
 }
 
+/**
+ * Tauri packages `bundle.resources` into installers but often does not leave a
+ * persistent `resources/` tree next to the release exe. Prefer that tree when
+ * present; otherwise assemble it from src-tauri paths listed in tauri.conf.json.
+ */
+function stageResources(releaseDir, stagingAppDir) {
+	const stagedResources = path.join(stagingAppDir, 'resources')
+	const releaseResources = path.join(releaseDir, 'resources')
+
+	if (fs.existsSync(releaseResources)) {
+		copyDir(releaseResources, stagedResources)
+		console.log(`Bundled resources/ from ${releaseResources}`)
+		return
+	}
+
+	const confPath = path.join(repoRoot, 'src-tauri', 'tauri.conf.json')
+	const conf = JSON.parse(fs.readFileSync(confPath, 'utf8'))
+	const resourceEntries = conf?.bundle?.resources
+	if (!Array.isArray(resourceEntries) || resourceEntries.length === 0) {
+		throw new Error(
+			`No resources/ next to the exe and no bundle.resources in ${confPath}`
+		)
+	}
+
+	const srcTauri = path.join(repoRoot, 'src-tauri')
+	for (const entry of resourceEntries) {
+		if (typeof entry !== 'string') {
+			throw new Error(
+				`Unsupported bundle.resources entry (expected string path): ${JSON.stringify(entry)}`
+			)
+		}
+		const from = path.join(srcTauri, entry)
+		if (!fs.existsSync(from) || !fs.statSync(from).isFile()) {
+			throw new Error(`bundle.resources file missing: ${from}`)
+		}
+		copyFile(from, path.join(stagedResources, entry))
+	}
+	console.log(
+		`Assembled resources/ from src-tauri (${resourceEntries.length} file(s); Tauri did not leave resources/ under ${releaseDir})`
+	)
+}
+
 function stagePortablePayload(releaseDir, stagingAppDir) {
 	fs.rmSync(stagingAppDir, { recursive: true, force: true })
 	fs.mkdirSync(stagingAppDir, { recursive: true })
@@ -134,13 +176,7 @@ function stagePortablePayload(releaseDir, stagingAppDir) {
 		copyFile(loader, path.join(stagingAppDir, 'WebView2Loader.dll'))
 	}
 
-	const resources = path.join(releaseDir, 'resources')
-	if (!fs.existsSync(resources)) {
-		throw new Error(
-			`Missing resources/ next to ${path.basename(builtExe)} at ${releaseDir}. The portable ZIP must include the same resources as the installer.`
-		)
-	}
-	copyDir(resources, path.join(stagingAppDir, 'resources'))
+	stageResources(releaseDir, stagingAppDir)
 
 	fs.writeFileSync(path.join(stagingAppDir, PORTABLE_MARKER), 'portable\n', 'utf8')
 	fs.writeFileSync(

src-tauri/WiX/context-menu.wxs

@@ -4,23 +4,27 @@
 
   The app owns registration at runtime (HKCU) so the settings toggle can
   enable/disable without elevation. Older builds wrote the same verb under
-  HKLM on install — those leftovers (and any HKCU keys from the app) are
-  removed on uninstall. We intentionally do NOT create the verb here.
+  HKLM on install — those leftovers are removed on uninstall.
+
+  Intentionally HKLM-only: mixing HKCU/HKMU RemoveRegistryKey with a
+  per-machine MSI component makes WiX light.exe fail (ICE / link abort).
+  HKCU keys are cleaned by the NSIS uninstall hooks and the in-app toggle.
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="ContextMenuRegistryFiles"
                  Guid="3C4F8A2B-7D19-4E5F-8B3A-C6D0E2F14975">
-        <!-- KeyPath marker so the component is installed; no shell verb is created. -->
-        <RegistryValue Root="HKMU"
-                       Key="Software\n0des\AltSendme"
-                       Name="ContextMenuCleanup"
-                       Type="integer"
-                       Value="1"
-                       KeyPath="yes"/>
+        <RegistryKey Root="HKLM"
+                     Key="Software\n0des\AltSendme"
+                     Action="createAndRemoveOnUninstall">
+          <RegistryValue Name="ContextMenuCleanup"
+                         Type="integer"
+                         Value="1"
+                         KeyPath="yes"/>
+        </RegistryKey>
 
-        <!-- Machine-wide leftovers from older MSI builds -->
+        <!-- Machine-wide leftovers from older MSI builds that created the verb -->
         <RemoveRegistryKey Root="HKLM"
                            Key="SOFTWARE\Classes\*\shell\Send with AltSendme"
                            Action="removeOnUninstall"/>
@@ -30,17 +34,6 @@
         <RemoveRegistryKey Root="HKLM"
                            Key="SOFTWARE\Classes\Directory\Background\shell\Send with AltSendme"
                            Action="removeOnUninstall"/>
-
-        <!-- Per-user keys written by the in-app toggle -->
-        <RemoveRegistryKey Root="HKCU"
-                           Key="Software\Classes\*\shell\Send with AltSendme"
-                           Action="removeOnUninstall"/>
-        <RemoveRegistryKey Root="HKCU"
-                           Key="Software\Classes\Directory\shell\Send with AltSendme"
-                           Action="removeOnUninstall"/>
-        <RemoveRegistryKey Root="HKCU"
-                           Key="Software\Classes\Directory\Background\shell\Send with AltSendme"
-                           Action="removeOnUninstall"/>
       </Component>
     </DirectoryRef>
   </Fragment>