Add in-app camera with direct upload to Nextcloud - #4058
Conversation
|
@Rasmussw can you make a rebase ? thanks |
7ded060 to
5b66fa5
Compare
|
Hi @marinofaggiana I've rebased onto the latest master. |
There are some compilation errors (due to the master change). Please rebase and try compiling it. Thanks. |
5b66fa5 to
6efca7e
Compare
|
8330e77 to
9b90f77
Compare
|
|
||
| var saveCameraMediaToCameraRoll: Bool { | ||
| get { | ||
| return getBoolPreference(key: "saveCameraMediaToCameraRoll", defaultValue: false) |
There was a problem hiding this comment.
default, for compatibility with previous version, must be set to true
| "_e2e_remove_folder_encrypted_" = "Decrypt"; | ||
| "_e2e_file_encrypted_" = "File encrypted"; | ||
| "_e2e_goto_settings_for_enable_" = "This is an encrypted directory, go to \"Settings\" and enable end-to-end encryption"; | ||
| "_e2e_error_" = "An internal end-to-end encryption error occurred."; |
| let isVideo: Bool | ||
| } | ||
| } | ||
|
|
|
iPad before: 
iPad after: 
In addition to the incorrect view incompatible with iPad, on the second attempt it did not display the image (black) |
|
Please use Lint, the code should be well formatted and commented in any modified places. 
|
|
Note: dear @Rasmussw It seems like the change is significant. The library is very outdated and one might consider replacing it (also). |
|
Hi Marino Thanks for the review.
First of all, we need to understand if there is an actual interest in this
feature from Nextcloud, if we take care of the issues you mentioned? If
there is, is it then a requirement that we fork TLPhotoPicker or is fine
the way we have implemented the feature as it is now? We believed that
there would be more work and maintenance for you at Nextcloud if we
implemented the feature by making the fork, thus we went with a solution
matching the current state of the Nextcloud iOS app.
We will off course look into the problems regarding the lint and ipad
issues.
Best regards, Rasmus
|
|
Hi @Rasmussw , Thanks for the clarification. Yes, I am interested in this feature, and I think the proposed change is a very good improvement for the app. From my point of view, keeping most of the implementation on the Nextcloud side is fine and probably easier to maintain. My main concern was the automatic save to the user’s Photo Library when taking a photo or video from TLPhotoPicker. Since we have now identified the exact point where this happens, I think the cleanest solution would probably be a small and focused change in TLPhotoPicker: add a configuration flag to decide whether captured photos/videos should be saved to the Photo Library or written to a temporary/custom location instead. On the Nextcloud side, we would then only need to retrieve those captured images/videos from that location and continue with the existing upload flow. However, I also noticed that the camera capture UI/flow seems to have changed, especially on iPad. I would like to better understand that part before deciding the final direction, because this is not only about where the captured file is saved, but also about how the capture view is presented and handled across devices. So, I would not require a full fork if this can be handled with a small, focused change. Ideally, this could be proposed upstream. If that is not possible, then a minimal fork limited to this behavior could also be acceptable. We will of course also need to address the lint and iPad issues before merging. |
|
Hi Marino
Thanks for the response.
We will look into what is possible and get back to you.
|
c342ec6 to
d15de8c
Compare
Introduces a custom AVFoundation camera that captures photos and videos and uploads them directly to Nextcloud without saving to the device camera roll by default. - Custom camera UI: shutter, flash, flip, mode selector (photo/video) - Pinch-to-zoom from 0.5x (ultra-wide) to 10x with live zoom label - Virtual multi-camera support (triple/dual-wide) for sub-1x zoom - Recording timer with red dot, screen stays on during video recording - App backgrounding gracefully stops recording in progress - Review screen after capture: retake or use, inline video playback - "Save to camera roll" opt-in toggle per session (off by default) - Global default for toggle in Settings -> Advanced - Filenames follow Nextcloud conventions via createFileName(), including "Maintain original filename" mode (IMG_XXXX.JPG) - Videos saved as .mov (QuickTime) matching Apple native camera format - Restored live photo upload logic: livePhotoFile and nativeFormat were inadvertently removed in a previous refactor - Fix: PHAuthorizationStatus.limited now correctly treated as authorized - Fix: NCViewerQuickLookView crash when asset is nil after model change Signed-off-by: Rasmus Wøldike <[email protected]> Signed-off-by: Rasmus Wøldike <[email protected]>
Signed-off-by: Rasmus Wøldike <[email protected]> Signed-off-by: Rasmus Wøldike <[email protected]>
Replace custom AVFoundation camera with UIImagePickerController by intercepting TLPhotoPicker's camera presentation and injecting customPhotoPickerViewController as delegate. Media is captured to a temp file and passed directly to the upload flow without saving to camera roll. Fixes iPad camera support. Signed-off-by: Rasmus Wøldike <[email protected]> Signed-off-by: Rasmus Wøldike <[email protected]> Signed-off-by: Rasmus Wøldike <[email protected]>
d15de8c to
9699781
Compare
Signed-off-by: Rasmus Wøldike <[email protected]> Signed-off-by: Rasmus Wøldike <[email protected]>
|
Definitely better, but I don't understand. As a dependency, you use https://github.com/tilltue/TLPhotoPicker 2.0.0 < 3.0.0, so the feature is already present? Doing a quick test, I saw that the file name is UUID, which breaks the normal file naming convention. It would be a good idea to use the same mask. ( let destURL = tempDir.appendingPathComponent(UUID().uuidString + ".jpg") |
|
Hi @marinofaggiana , Thanks for the review. To answer your question, didCaptureMediaURL does not exist in the original TLPhotoPicker. I added it in my own fork and submitted a PR upstream (tilltue/TLPhotoPicker#383), which is still awaiting review. The current committed code actually still points to the original tilltue/TLPhotoPicker. I will fix the UUID filename issue, but regarding the dependency, what would you prefer?
Best regards, |
Hi @Rasmussw, |
|
Hi @marinofaggiana, Good news, the upstream PR has actually just been merged into master(tilltue/TLPhotoPicker#383), and a new tag(2.1.20) has been released with the changes. I will update the dependency to point to the official repositorys new version and push the UUID filename fix in my next commit. Best regards, Rasmus |
…load-camera-clean Signed-off-by: Rasmus Wøldike <[email protected]>
- Use didCaptureMediaURL from TLPhotoPicker 2.1.21 with correct filename convention via createFileName - Remove unused strings (_retake_, _use_photo_, _use_video_) - Fix autoMkcol version check to use isServerVersion - Remove duplicate function declarations from merge Signed-off-by: Rasmus Wøldike <[email protected]>
…ings Only add _save_to_camera_roll_ and _save_to_camera_roll_desc_ strings. All other strings from upstream master are preserved. Signed-off-by: Rasmus Wøldike <[email protected]>
59eddf2 to
a47d8e7
Compare
|
Updated the PR with the following changes:
Best regards, Rasmus |
|
@Rasmussw can you make a git merge origin/master ? Sorry but I've been very busy |
…load-camera-clean Signed-off-by: Rasmus Wøldike <[email protected]>
e12df71 to
1e12d52
Compare
|
Latest master is merged into the branch. |
|
@Rasmussw great job ! thank you ! |
|
Thanks again for the review and for merging the PR! Do you have an idea of when this will be included in a release/tag and available in the App Store? Best regards Rasmus |
|
It won't be anytime soon; we've just added a new image and video viewer, as well as an updated Media search, which deserves a thorough test. You can try it out now! It's already in Master and TestFlight. |
2 participants
This PR adds a custom in-app camera to the iOS client that captures photos and videos and uploads them directly to Nextcloud, bypassing the device camera roll by default. Users can optionally enable saving to the camera roll via a per-session toggle, with a global default available in Settings -> Advanced.
In the current flow, media is always saved to the system photo library before being uploaded to Nextcloud. This creates potentially unwanted local copies, introduces privacy concerns, and adds manual cleanup for users. This change ensures media can be captured and stored directly in Nextcloud without ever touching the camera roll. This is especially important in regulated environments with BYOD-policies, i.e. environments where media content captured can identify a person, thus potentially violating GDPR.
The custom camera uses AVFoundation to capture media directly to a temporary directory. Files are reviewed before upload and then passed into Nextcloud's existing upload pipeline. Saving to the camera roll is fully optional and only occurs if explicitly enabled by the user. Existing picker and upload flows remain unchanged.
Additional notes
Default behaviour does not affect existing users
Upload reliability uses existing background upload infrastructure
Camera roll is never accessed unless explicitly enabled