WIP: Storacha chnages to check if all changes in next is intact #752
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/build.gradle.kts # app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt # app/src/main/res/values/strings.xml # gradle/libs.versions.toml
This commit applies edge-to-edge insets to the "Add" button in `StorachaMediaFragment` and the "Continue" button in `StorachaClientQRFragment` to ensure they are displayed correctly with navigation bars. Additionally, the following dependencies were updated: - AGP to 8.12.1 - Core KTX to 1.17.0 - Kotlin to 2.2.10 - KSP to 2.2.10-2.0.2 - Material3 to 1.4.0-beta02
This commit updates `StorachaAccountDetailsFragment` to apply window insets for edge-to-edge display. Specifically, it applies bottom insets to the `buttonBar` to accommodate navigation bars.
Feature/storacha next
# Conflicts: # app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt # app/src/main/res/navigation/space_setup_navigation.xml # gradle/libs.versions.toml
added 29 commits
November 19, 2025 12:34
This commit removes all code related to the Google Drive integration, including activities, fragments, conduits, layouts, and related assets. Other changes include: - Upgrade Gradle to 9.2.0 - Add custom CameraX implementation for photo and video - Add in-app update coordinator - UI/UX improvements to login, media preview, and selection - Various bug fixes and code cleanup
- Optimized camera image handling to use the existing cached file directly instead of creating a copy, preventing 0-byte file errors. - Introduced `getOutputMediaFileByCacheNoTimestamp` to create temporary files with predictable names. - Refactored `StorachaMediaFragment` to correctly handle URIs from both the camera and the gallery.
Updated file type and account icons for a more consistent UI. Revised and clarified instructional text for DID and QR code flows. Added support for ZIP file type detection.
- Replaced `takePictureLauncher` with two new launchers: - `modernCameraLauncher` for standard photo capture using `ActivityResultContracts.TakePicture`. - `customCameraLauncher` for launching `CameraActivity` which supports photo, video, and multiple captures. - Added a feature flag `appConfig.useCustomCamera` to determine which camera launcher to use. - Replaced `Utility.getOutputMediaFileByCache` with `getOutputMediaFileByCacheNoTimestamp` to prevent duplicate timestamps in filenames for captured media. - Refactored camera file handling to correctly process URIs from both the modern `TakePicture` contract and the custom `CameraActivity`.
This change introduces a `useCleanFilenames` flag to the camera configuration. When enabled, media files are saved with simple names like `IMG_123.jpg` instead of timestamped names like `20250119_143045.IMG_123.jpg`. The flag has been implemented for both photo and video capture and is now enabled for the Storacha service.
prevented duplicate login calls in StorachaLoginFragment
Storacha ViewModel refresh queue implementation Fixed Storacha adapter view recycling and async handling Added loading spinner to Storacha grid items Fixed icon tinting in Storacha adapter
…ewModel added load complete callback to trigger continuous scrolling pre-compiled regex patterns in FileMetadataFetcher for performance refactored StorachaMediaGridAdapter image loading and icon tinting
feat: switched to dweb gateway for metadata fetching
Bringing in latest changes from next branch including: - Media list viewholder improvements for upload and preview screens - Camera screen enhancements with video recording timer - PDF thumbnail generation and display - WebDAV screen refactoring with Jetpack Compose - UI improvements for media grids in selection mode
Resolved conflicts in: - app/build.gradle.kts - app/src/main/java/net/opendasharchive/openarchive/features/media/camera/CameraConfig.kt - app/src/main/res/values/strings.xml
Cleaned up CameraConfig.kt by removing trailing commas. Added Picasso and Jsoup to the project dependencies.
Updated app version from 4.0.4 to 4.0.9 and adjusted the version code.
Escaped apostrophes in several Ukrainian translation strings to fix rendering issues. Removed a duplicated `web_dav_host_error` string and corrected a malformed CDATA tag in the Turkish translation file.
# Conflicts: # app/build.gradle.kts # app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt # app/src/main/java/net/opendasharchive/openarchive/features/core/BaseFragment.kt # app/src/main/res/values-uk/strings.xml
Resolved conflicts: - Space.kt: Kept STORACHA enum entry and updated RAVEN naming - BaseFragment.kt: Kept storacha-related imports for session management - MainActivity.kt: Merged DWeb groups and Storacha checks in menu logic - SpaceSetupFragment.kt: Kept navigation approach with Storacha callback - app_nav_graph.xml: Added Storacha navigation actions only (Snowbird migrated) - strings.xml: Kept all Storacha strings and Sync Preferences - libs.versions.toml: Updated zxing library versions and naming
Refactored the Snowbird feature to launch in a separate `SnowbirdActivity` instead of a fragment within the main navigation graph. - Modified `SpaceSetupFragment` to start `SnowbirdActivity` via an intent, decoupling it from the main `NavGraph`. - Removed unused ZXing dependencies from `gradle/libs.versions.toml`.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
detekt found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.