Merge release 3.6 to master #2615
Merged
Conversation
This file contains 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
SMB version of MainActivityHelper.checkFolder()
- Converted FTP service related classes to use Kotlin - Upgraded AndroidX libraries to latest version - Implemented FtpFile* classes backed by DocumentFile For Android Jellybean, will use legacy java.io.File-based backend, i.e. Apache FtpServer's default For Android Kitkat to Lollipop, will use DocumentFile backend using file:/// URI prefix; for external storage, will be using DocumentFile backend using content:// URI prefix For Android Marshmallow onwards, will all be using DocumentFile backend using content:// URI prefix Correspondingly, folder chooser dialog will also be different. For Android before Marshmallow, will be using the legacy folder chooser dialog For Android before Lollipop to Marshmallow, if selected folder is on external SD/attached via OTG, user action will be required to explicitly grant write permission to the folder using DocumentsUI chooser For Android Marshmallow and onwards, will entirely be using DocumentsUI's folder chooser
Fixes #2315. Delegating to AppConfig.toast() should help prevent using the wrong thread.
- Add suppressions to FtpServerFragment - Fix code formatting issues
URI.decode() doesn't like space in the paths... replaced with %20 for the normalize() process and turned them back to space afterwards.
Items defined in FtpServerFragment.onOptionsItemSelected() must go through MainActivity.onOptionsItemSelected() first, and Objects.requireNonNull(mainFragment) may become an obstacle. Defer checking to individual item ID selection, and let the event bubble through at the last super.onOptionsItemSelected() call. This seems a cleaner way, or else we may need to add a block of item ID check before Objects.requireNonNull(mainFragment) which is more ugly.
- AndroidFtpFileSystemView, use Uri.encode() and Uri.decode() instead of monkey-patching String.replace() - MainActivity, use alternate MainFragment existence check with lambda to reduce code duplication
Allows null safety check, fixes #2436.
To (hopefully) reduce the complexity and duplication score
Auto Capitalization & Request Focus
Also added tests for create subfolders, and upload files to it
Added App Name & Package to error reports
DocumentFile-based FTP server implementation
Change archive related classes to Kotlin
Move IV value to build.gradle
Fixes #2592. - Refactored FtpServerFragment to allow different ActivityResultLauncher instances of different callbacks to be created in same code - Added routine to prompt user to grant access to device's internal storage (default FTP server shared folder) at SAF level
Bugfix/2595 Trim file operation inputs
Add SAF permission grant routine for FTP server first run
Check memory for OOM
translation completed for the source file '/app/src/main/res/values/strings.xml' on the 'pt_BR' language.
Its previous string value contradicts its behaviour - Amaze will use old method (ls) to list files when preference PreferenceConstants.PREFERENCE_ROOT_LEGACY_LISTING is true, while the translation string reads contradictory meaning.
Fix circular icons in grid
…-explanation Fix value for legacy_listing_summary
…ter_pt_BR Translate '/app/src/main/res/values/strings.xml' in 'pt_BR'
Co-authored-by: Unpublished <[email protected]>
Add liberapay as funding
Fix redundant test runs
Updated Shortcut Icons
|
You made a tag without merging this first? |
|
@EmmanuelMess Yea after release on current branch only we merge with master and create new release branch. Basically no more work to be done on this branch. |
|
We're okay to merge here. Pl. review. |
EmmanuelMess
approved these changes
Jun 12, 2021
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.
Description
Merge release 3.6 to master. Prepare for next iteration.
Issue tracker
Automatic tests
Manual tests
Build tasks success
Successfully running following tasks on local:
./gradlew assembledebug./gradlew spotlessCheck