Stage/dweb next merge #744
Merged
+2,579
−655
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
updated save lib fixed download media in another device
- imported strong ok http client from netcipher due to R.class conflicts with dependencies - Refactored SaveClient to set/unset orbot proxy - added dependency injection for saveclient and tor status repository - update general settings to include tor connection status with some fakery for user experience when orbot is flaky - refactored GDrive implementation to use basic API with SaveClient - added a broadcast reciever for Orbot status, updates the tor repository
separate dto objects created for mapping dweb api responses
Conflicts: app/build.gradle app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt app/src/main/java/net/opendasharchive/openarchive/core/di/CoreModule.kt app/src/main/java/net/opendasharchive/openarchive/features/media/ReviewActivity.kt app/src/main/java/net/opendasharchive/openarchive/features/settings/GeneralSettingsActivity.kt app/src/main/java/net/opendasharchive/openarchive/services/internetarchive/IaConduit.kt app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt app/src/main/java/net/opendasharchive/openarchive/upload/UploadService.kt app/src/main/java/net/opendasharchive/openarchive/util/Prefs.kt app/src/main/res/layout/activity_main.xml app/src/main/res/xml/prefs_general.xml build.gradle gradle/wrapper/gradle-wrapper.properties settings.gradle
avoid reciever, use callback
running is slow for debugging
feat: renable orbot and use status
…removal Removed "Tor is disabled" pop-up
…n prefs_general.xml
…utton-ui-fix-for-dark-mode Bug fix/settings screen tor button UI fix for dark mode
# Conflicts: # gradle/wrapper/gradle-wrapper.properties
# Conflicts: # app/build.gradle.kts # app/src/main/java/net/opendasharchive/openarchive/features/core/dialog/BaseDialog.kt # app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt # app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt # app/src/main/res/values/strings.xml # gradle/libs.versions.toml # gradle/wrapper/gradle-wrapper.properties
# Conflicts: # app/src/main/java/net/opendasharchive/openarchive/features/settings/license/SetupLicenseFragment.kt # app/src/main/res/navigation/space_setup_navigation.xml # gradle/libs.versions.toml
# Conflicts: # app/src/main/res/layout/activity_main.xml
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt # gradle/libs.versions.toml
# Conflicts: # app/build.gradle.kts # app/src/main/java/net/opendasharchive/openarchive/core/di/PasscodeModule.kt # app/src/main/java/net/opendasharchive/openarchive/db/Space.kt # app/src/main/java/net/opendasharchive/openarchive/features/main/MainActivity.kt # app/src/main/java/net/opendasharchive/openarchive/features/onboarding/SpaceSetupActivity.kt # app/src/main/java/net/opendasharchive/openarchive/features/settings/passcode/AppConfig.kt # app/src/main/java/net/opendasharchive/openarchive/services/gdrive/GDriveFragment.kt # app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavFragment.kt # app/src/main/jniLibs/arm64-v8a/libsave.so # app/src/main/jniLibs/armeabi-v7a/libsave.so # app/src/main/res/layout/fragment_space_setup.xml # app/src/main/res/navigation/app_nav_graph.xml # app/src/main/res/values/strings.xml # build.gradle.kts # gradle/libs.versions.toml
extracted snowbird_nav_graph.xml
![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.
feat: add DWeb server control to SnowbirdFragment and update service …
# Conflicts: # app/src/main/java/net/opendasharchive/openarchive/core/logger/AppLogger.kt # app/src/main/java/net/opendasharchive/openarchive/features/core/BaseFragment.kt
updated compose version
# Conflicts: # app/src/main/java/net/opendasharchive/openarchive/core/logger/AppLogger.kt # app/src/main/java/net/opendasharchive/openarchive/features/core/BaseFragment.kt
# Conflicts: # app/src/main/java/net/opendasharchive/openarchive/features/core/BaseFragment.kt
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.