diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d353b0963c..669b03b02cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Table of Contents -* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased) +* [Changelog for 4.6.1](#changelog-for-owncloud-android-client-461-2025-08-01) * [Changelog for 4.6.0](#changelog-for-owncloud-android-client-460-2025-07-22) * [Changelog for 4.5.1](#changelog-for-owncloud-android-client-451-2025-04-03) * [Changelog for 4.5.0](#changelog-for-owncloud-android-client-450-2025-03-24) @@ -28,12 +28,12 @@ * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20) * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24) * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below) -# Changelog for ownCloud Android Client [unreleased] (UNRELEASED) +# Changelog for ownCloud Android Client [4.6.1] (2025-08-01) -The following sections list the changes in ownCloud Android Client unreleased relevant to +The following sections list the changes in ownCloud Android Client 4.6.1 relevant to ownCloud admins and users. -[unreleased]: https://github.com/owncloud/android/compare/v4.6.0...master +[4.6.1]: https://github.com/owncloud/android/compare/v4.6.0...v4.6.1 ## Summary diff --git a/changelog/unreleased/4649 b/changelog/4.6.1_2025-08-01/4649 similarity index 100% rename from changelog/unreleased/4649 rename to changelog/4.6.1_2025-08-01/4649 diff --git a/changelog/unreleased/4652 b/changelog/4.6.1_2025-08-01/4652 similarity index 100% rename from changelog/unreleased/4652 rename to changelog/4.6.1_2025-08-01/4652 diff --git a/changelog/unreleased/4654 b/changelog/4.6.1_2025-08-01/4654 similarity index 100% rename from changelog/unreleased/4654 rename to changelog/4.6.1_2025-08-01/4654 diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index ff6575fcffa..322c432153e 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -100,8 +100,8 @@ android { testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner" - versionCode = 46000000 - versionName = "4.6.0" + versionCode = 46000100 + versionName = "4.6.1" buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\"" buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\"" diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt index 9777ec03d6a..06f536d1b77 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt @@ -43,6 +43,21 @@ class ReleaseNotesViewModel( companion object { val releaseNotesList = listOf( + ReleaseNote( + title = R.string.release_notes_4_6_1_title_duplicated_automatic_uploads, + subtitle = R.string.release_notes_4_6_1_subtitle_duplicated_automatic_uploads, + type = ReleaseNoteType.BUGFIX + ), + ReleaseNote( + title = R.string.release_notes_4_6_1_title_bearer_token_handling, + subtitle = R.string.release_notes_4_6_1_subtitle_bearer_token_handling, + type = ReleaseNoteType.BUGFIX + ), + ReleaseNote( + title = R.string.release_notes_4_6_1_title_shares_space_docs_provider, + subtitle = R.string.release_notes_4_6_1_subtitle_shares_space_docs_provider, + type = ReleaseNoteType.ENHANCEMENT + ), ReleaseNote( title = R.string.release_notes_bugfixes_title, subtitle = R.string.release_notes_bugfixes_subtitle, diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index b842c2923d3..ee84131dac9 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -737,6 +737,12 @@ Release note icon Minor bugfixes Some bugs were fixed to improve experience in the app + Shares space in Android native file explorer + Shares space now appears next to the other spaces in Documents Provider for Infinite Scale accounts + Automatic uploads improved + Automatic uploads are more consistent against duplications + Multiple accounts on Infinite Scale servers + Multiple accounts can be logged in at the same time on the same Infinite Scale server. Additionally, fixed a problem related with session handling Open in web Open in %1$s (web)