Skip to content

Media upload/downloads on mobile via robius-file-picker #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinaboos merged 2 commits into from
May 31, 2026
Merged

Media upload/downloads on mobile via robius-file-picker #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3eb01
Media upload/downloads on mobile via `robius-file-picker`
kevinaboos May 30, 2026
4f4e762
clippy
kevinaboos May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
519 changes: 68 additions & 451 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "de

## Including this crate automatically configures all `robius-*` crates to work with Makepad.
robius-use-makepad = "0.1.1"
robius-open = { git = "https://github.com/project-robius/robius" }
robius-directories = { git = "https://github.com/project-robius/robius" }
robius-file-picker = { git = "https://github.com/project-robius/robius" }
robius-location = { git = "https://github.com/project-robius/robius" }
robius-open = { git = "https://github.com/project-robius/robius" }


anyhow = "1.0"
Expand Down Expand Up @@ -106,11 +107,6 @@ reqwest = { version = "0.12", default-features = false, optional = true, feature
"macos-system-configuration",
] }

# Desktop-only file dialog (doesn't work on iOS/Android)
[target.'cfg(not(any(target_os = "ios", target_os = "android")))'.dependencies]
rfd = "0.15"


## For OAuth/SSO login on iOS, via `ASWebAuthenticationSession`. Ugh....
[target.'cfg(target_os = "ios")'.dependencies]
robius-web-auth-session = { git = "https://github.com/project-robius/robius" }
Expand Down
11 changes: 4 additions & 7 deletions src/home/room_image_viewer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,14 @@ pub fn populate_matrix_image_modal(
}
}

/// Gets image name and file size in bytes from an event timeline item.
/// Gets the image's file name and size in bytes from an event timeline item.
pub fn get_image_name_and_filesize(event_tl_item: &EventTimelineItem) -> (String, u64) {
if let Some(message) = event_tl_item.content().as_message() {
if let MessageType::Image(image_content) = message.msgtype() {
let name = message.body().to_string();
let size = image_content
.info
.as_ref()
let name = image_content.filename().to_string();
let size = image_content.info.as_ref()
.and_then(|info| info.size)
.map(u64::from)
.unwrap_or(0);
.map_or(0, u64::from);
return (name, size);
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/home/room_screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use crate::{
},
room::{BasicRoomDetails, room_input_bar::{RoomInputBarState, RoomInputBarWidgetRefExt}, typing_notice::TypingNoticeWidgetExt},
shared::{
attachment_download::{DownloadDisplayState, DownloadKind, DownloadableAttachment, PendingDownload, PendingDownloadState, media_source_mxc, start_attachment_download}, avatar::{AvatarState, AvatarWidgetRefExt}, confirmation_modal::ConfirmationModalContent, file_upload_modal::FileUploadAttemptId, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, image_viewer::{ImageViewerAction, ImageViewerMetaData, LoadState}, jump_to_bottom_button::{JumpToBottomButtonWidgetExt, UnreadMessageCount}, popup_list::{PopupKind, enqueue_popup_notification}, restore_status_view::RestoreStatusViewWidgetExt, styles::*, text_or_image::{TextOrImageAction, TextOrImageRef, TextOrImageStatus, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt
attachment_download::{enqueue_already_downloading_notification, DownloadDisplayState, DownloadKind, DownloadableAttachment, PendingDownload, PendingDownloadState, media_source_mxc, start_attachment_download}, avatar::{AvatarState, AvatarWidgetRefExt}, confirmation_modal::ConfirmationModalContent, file_upload_modal::FileUploadAttemptId, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, image_viewer::{ImageViewerAction, ImageViewerMetaData, LoadState}, jump_to_bottom_button::{JumpToBottomButtonWidgetExt, UnreadMessageCount}, popup_list::{PopupKind, enqueue_popup_notification}, restore_status_view::RestoreStatusViewWidgetExt, styles::*, text_or_image::{TextOrImageAction, TextOrImageRef, TextOrImageStatus, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt
},
sliding_sync::{BackwardsPaginateUntilEventRequest, MatrixRequest, PaginationDirection, TimelineEndpoints, TimelineKind, TimelineRequestSender, UserPowerLevels, get_client, submit_async_request, take_timeline_endpoints}, utils::{self, ImageFormat, MEDIA_THUMBNAIL_FORMAT, RoomNameId, unix_time_millis_to_datetime}
};
Expand Down Expand Up @@ -2251,6 +2251,7 @@ impl RoomScreen {
let mxc = media_source_mxc(&info.media_source);
// Prevent the same attachment from being downloaded more than once at a time.
if tl.pending_downloads.iter().any(|p| &p.mxc == mxc) {
enqueue_already_downloading_notification();
continue;
}
tl.pending_downloads.push(PendingDownload {
Expand All @@ -2259,7 +2260,7 @@ impl RoomScreen {
});
portal_list.redraw(cx);
let update_sender = tl.media_cache.timeline_update_sender().cloned();
start_attachment_download(cx, info.clone(), update_sender);
start_attachment_download(info.clone(), update_sender);
}
MessageAction::CancelDownload(mxc) => {
submit_async_request(MatrixRequest::CancelDownload(mxc.clone()));
Expand Down
1 change: 1 addition & 0 deletions src/home/upload_progress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ script_mod! {

/// The current state of the upload view.
#[derive(Clone, Debug, Default)]
#[allow(clippy::large_enum_variant)]
pub enum UploadViewState {
/// Normal state - upload in progress or ready.
#[default]
Expand Down
230 changes: 59 additions & 171 deletions src/room/room_input_bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,7 @@ use matrix_sdk::room::reply::{EnforceThread, Reply};
use ruma::events::room::message::AddMentions;
use matrix_sdk_ui::timeline::{EmbeddedEvent, EventTimelineItem, TimelineEventItemId};
use ruma::{events::room::message::{LocationMessageEventContent, MessageType, ReplyWithinThread, RoomMessageEventContent}, OwnedEventId, OwnedRoomId};
use crate::{home::{editing_pane::{EditingPaneState, EditingPaneWidgetExt, EditingPaneWidgetRefExt}, location_preview::{LocationPreviewWidgetExt, LocationPreviewWidgetRefExt}, room_screen::{MessageAction, RoomScreenProps, populate_preview_of_timeline_item}, tombstone_footer::{SuccessorRoomDetails, TombstoneFooterWidgetExt}, upload_progress::UploadProgressViewWidgetRefExt}, location::init_location_subscriber, settings::app_preferences::{AppPreferencesGlobal, AppPreferencesAction}, shared::{avatar::AvatarWidgetRefExt, file_upload_modal::{AttachmentUpload, FilePreviewerAction, FileUploadAttemptId}, html_or_plaintext::HtmlOrPlaintextWidgetRefExt, mentionable_text_input::MentionableTextInputWidgetExt, popup_list::{PopupKind, enqueue_popup_notification}, styles::*}, sliding_sync::{MatrixRequest, TimelineKind, UserPowerLevels, submit_async_request}, utils};

/// Result of the native file picker plus background file-loading work.
#[cfg_attr(any(target_os = "ios", target_os = "android"), allow(dead_code))]
enum PendingFileSelection {
/// A file was selected and read successfully.
Selected {
upload: AttachmentUpload,
},
/// The picker was dismissed without selecting a file.
Cancelled,
/// The file could not be selected, inspected, or read.
Error(String),
}

/// Receives the pending file-selection result back on the UI thread.
type PendingFileSelectionReceiver = std::sync::mpsc::Receiver<PendingFileSelection>;
use crate::{home::{editing_pane::{EditingPaneState, EditingPaneWidgetExt, EditingPaneWidgetRefExt}, location_preview::{LocationPreviewWidgetExt, LocationPreviewWidgetRefExt}, room_screen::{MessageAction, RoomScreenProps, populate_preview_of_timeline_item}, tombstone_footer::{SuccessorRoomDetails, TombstoneFooterWidgetExt}, upload_progress::UploadProgressViewWidgetRefExt}, location::init_location_subscriber, settings::app_preferences::{AppPreferencesAction, AppPreferencesGlobal}, shared::{avatar::AvatarWidgetRefExt, file_upload_modal::{AttachmentUpload, FilePreviewerAction, FileUploadAttemptId, load_selected_file}, html_or_plaintext::HtmlOrPlaintextWidgetRefExt, mentionable_text_input::MentionableTextInputWidgetExt, popup_list::{PopupKind, enqueue_popup_notification}, styles::*}, sliding_sync::{MatrixRequest, TimelineKind, UserPowerLevels, submit_async_request}, utils};

script_mod! {
use mod.prelude.widgets.*
Expand Down Expand Up @@ -210,8 +194,6 @@ pub struct RoomInputBar {
/// Cached natural Fit height of the input_bar, used as the animation
/// target when the editing pane is being hidden.
#[rust] input_bar_natural_height: f64,
/// The pending file picker / background load operation, if any.
#[rust] pending_file_selection: Option<PendingFileSelectionReceiver>,
}

impl ScriptHook for RoomInputBar {
Expand Down Expand Up @@ -254,48 +236,9 @@ impl Widget for RoomInputBar {
}

if let Event::Actions(actions) = event {
// Handle changes to the `send_on_enter` preference.
for action in actions {
if let Some(AppPreferencesAction::SendOnEnterChanged(v)) = action.downcast_ref() {
self.mentionable_text_input(cx, ids!(mentionable_text_input))
.text_input_ref()
.set_submit_on_enter(*v);
}
}

self.handle_actions(cx, actions, room_screen_props);
}

// Handle signal events for pending file loads from background threads
if let Event::Signal = event {
if let Some(receiver) = &self.pending_file_selection {
let mut remove_receiver = false;
match receiver.try_recv() {
Ok(PendingFileSelection::Selected { upload }) => {
Cx::post_action(FilePreviewerAction::Show { upload });
remove_receiver = true;
}
Ok(PendingFileSelection::Cancelled) => {
remove_receiver = true;
}
Ok(PendingFileSelection::Error(error)) => {
enqueue_popup_notification(error, PopupKind::Error, None);
remove_receiver = true;
}
Err(std::sync::mpsc::TryRecvError::Empty) => {
// Still waiting for file picker / loader.
}
Err(std::sync::mpsc::TryRecvError::Disconnected) => {
remove_receiver = true;
}
}
if remove_receiver {
self.pending_file_selection = None;
self.redraw(cx);
}
}
}

self.view.handle_event(cx, event, scope);
}

Expand Down Expand Up @@ -342,6 +285,14 @@ impl RoomInputBar {
let mentionable_text_input = self.mentionable_text_input(cx, ids!(mentionable_text_input));
let text_input = mentionable_text_input.text_input_ref();

for action in actions {
// Handle changes to the `send_on_enter` preference.
if let Some(AppPreferencesAction::SendOnEnterChanged(v)) = action.downcast_ref() {
text_input.set_submit_on_enter(*v);
continue;
}
}

// Clear the replying-to preview pane if the "cancel reply" button was clicked
// or if the `Escape` key was pressed within the message input box.
if self.button(cx, ids!(cancel_reply_button)).clicked(actions)
Expand Down Expand Up @@ -419,9 +370,7 @@ impl RoomInputBar {
}

// Handle the send message button being clicked, or a `Returned` action
// from the message text input. The text input only emits `Returned`
// for the key combination chosen by the user in App Settings (plus
// Cmd/Ctrl+Enter, which always submits).
// from the message text input, which already respects the user's app setting.
if self.button(cx, ids!(send_message_button)).clicked(actions)
|| text_input.returned(actions).is_some()
{
Expand Down Expand Up @@ -664,30 +613,17 @@ impl RoomInputBar {
self.view.check_box(cx, ids!(tsp_sign_checkbox)).active(cx)
}

/// Opens the native file picker dialog to select a file for upload.
///
/// The timeline target is captured at this moment to ensure the file is uploaded
/// to the correct room/thread, even if the user switches rooms while the modal is open.
#[cfg(not(any(target_os = "ios", target_os = "android")))]
/// Shows the native file picker dialog to select a file to be uploaded.
fn open_file_picker(
&mut self,
cx: &mut Cx,
timeline_kind: TimelineKind,
) {
if self.pending_file_selection.is_some() {
enqueue_popup_notification(
"A file selection is already in progress.",
PopupKind::Error,
None,
);
return;
}

if self.view.view(cx, ids!(upload_progress_view)).visible() {
enqueue_popup_notification(
"Finish the current upload before starting another one.",
PopupKind::Error,
None,
"Finish or cancel the current upload before starting another one.",
PopupKind::Warning,
Some(7.0),
);
return;
}
Expand All @@ -698,54 +634,57 @@ impl RoomInputBar {
#[cfg(feature = "tsp")]
let sign_with_tsp = self.is_tsp_signing_enabled(cx);

let (sender, receiver) = std::sync::mpsc::channel();
self.pending_file_selection = Some(receiver);
let dialog_task = rfd::AsyncFileDialog::new().pick_file();

// Native thread, not a tokio task: rfd's macOS dialog panics if it
// runs on a tokio worker thread.
cx.spawn_thread(move || {
let result = match futures::executor::block_on(dialog_task) {
Some(selected_file) => {
#[cfg(feature = "tsp")]
{
load_selected_file(
selected_file.path().to_path_buf(),
// `robius-file-picker` ensures that this `on_picked` callback runs on a bg thread.
let on_picked = move |result: robius_file_picker::Result<Option<robius_file_picker::PickedFile>>| {
match result {
Ok(Some(picked)) => match picked.into_local_file() {
Ok(local_file) => {
let loaded = load_selected_file(
local_file,
timeline_kind,
in_reply_to,
#[cfg(feature = "tsp")]
sign_with_tsp,
)
}
#[cfg(not(feature = "tsp"))]
{
load_selected_file(
selected_file.path().to_path_buf(),
timeline_kind,
in_reply_to,
)
);
match loaded {
Ok(upload) => Cx::post_action(FilePreviewerAction::Show { upload }),
Err(e) => enqueue_popup_notification(e, PopupKind::Error, None),
}
}
}
None => PendingFileSelection::Cancelled,
};
if sender.send(result).is_err() {
makepad_widgets::error!("Failed to send file picker result to UI: receiver dropped");
Err(e) => enqueue_popup_notification(
format!("Failed to read selected file: {e}"),
PopupKind::Error,
None,
),
},
// User dismissed the picker, do nothing.
Ok(None) => {}
Err(err) => enqueue_popup_notification(
format!("Error selecting a file: {err}"),
PopupKind::Error,
None,
),
}
SignalToUI::set_ui_signal();
});
}
};

/// Shows a "not supported" message on mobile platforms.
#[cfg(any(target_os = "ios", target_os = "android"))]
fn open_file_picker(
&mut self,
_cx: &mut Cx,
_timeline_kind: TimelineKind,
) {
enqueue_popup_notification(
"File uploads are not yet supported on mobile.",
PopupKind::Error,
Some(5.0),
);
match robius_file_picker::FileDialog::new().pick_file(on_picked) {
Ok(()) => {}
Err(robius_file_picker::Error::AlreadyOpen) => {
enqueue_popup_notification(
"A file picker is already open.",
PopupKind::Error,
Some(4.0),
);
}
Err(err) => {
makepad_widgets::error!("Failed to launch file picker: {err}");
enqueue_popup_notification(
format!("Failed to open file picker: {err}"),
PopupKind::Error,
None,
);
}
}
}
}

Expand Down Expand Up @@ -964,54 +903,3 @@ enum ShowEditingPaneBehavior {
editing_pane_state: EditingPaneState,
},
}

#[cfg(not(any(target_os = "ios", target_os = "android")))]
fn load_selected_file(
selected_file_path: std::path::PathBuf,
timeline_kind: TimelineKind,
in_reply_to: Option<OwnedEventId>,
#[cfg(feature = "tsp")]
sign_with_tsp: bool,
) -> PendingFileSelection {
let metadata = match std::fs::metadata(&selected_file_path) {
Ok(m) => m,
Err(e) => return PendingFileSelection::Error(format!("Unable to access file: {e}")),
};
if !metadata.is_file() {
return PendingFileSelection::Error("Cannot upload directories or special files".to_string());
}
let file_size = metadata.len();
if file_size == 0 {
return PendingFileSelection::Error("Cannot upload empty file".to_string());
}
let mime = mime_guess::from_path(&selected_file_path)
.first_or_octet_stream();
let preview_data = if crate::image_utils::is_displayable_image(mime.essence_str()) {
match std::fs::read(&selected_file_path) {
Ok(data) => Some(std::sync::Arc::new(data)),
Err(e) => return PendingFileSelection::Error(format!("Unable to read image preview: {e}")),
}
} else {
None
};
let name = selected_file_path
.file_name()
.map(|n| n.to_string_lossy().to_string())
.unwrap_or_else(|| "unknown".to_string());

PendingFileSelection::Selected {
upload: AttachmentUpload {
timeline_kind,
file_data: crate::shared::file_upload_modal::FileUploadMetadata {
path: selected_file_path,
caption: Some(name),
mime_type: mime.to_string(),
preview_data,
size: file_size,
},
in_reply_to,
#[cfg(feature = "tsp")]
sign_with_tsp,
},
}
}
Loading
Loading