Skip to content

Commit 83c9c15

Browse files
authored
Merge pull request #4655 from owncloud/release/4.6.1
[RELEASE] 4.6.1
2 parents 1147ebc + 6330923 commit 83c9c15

7 files changed

Lines changed: 27 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Table of Contents
22

3-
* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
3+
* [Changelog for 4.6.1](#changelog-for-owncloud-android-client-461-2025-08-01)
44
* [Changelog for 4.6.0](#changelog-for-owncloud-android-client-460-2025-07-22)
55
* [Changelog for 4.5.1](#changelog-for-owncloud-android-client-451-2025-04-03)
66
* [Changelog for 4.5.0](#changelog-for-owncloud-android-client-450-2025-03-24)
@@ -28,12 +28,12 @@
2828
* [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
2929
* [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
3030
* [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
31-
# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
31+
# Changelog for ownCloud Android Client [4.6.1] (2025-08-01)
3232

33-
The following sections list the changes in ownCloud Android Client unreleased relevant to
33+
The following sections list the changes in ownCloud Android Client 4.6.1 relevant to
3434
ownCloud admins and users.
3535

36-
[unreleased]: https://github.com/owncloud/android/compare/v4.6.0...master
36+
[4.6.1]: https://github.com/owncloud/android/compare/v4.6.0...v4.6.1
3737

3838
## Summary
3939

owncloudApp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ android {
100100

101101
testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
102102

103-
versionCode = 46000000
104-
versionName = "4.6.0"
103+
versionCode = 46000100
104+
versionName = "4.6.1"
105105

106106
buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
107107
buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ class ReleaseNotesViewModel(
4343

4444
companion object {
4545
val releaseNotesList = listOf(
46+
ReleaseNote(
47+
title = R.string.release_notes_4_6_1_title_duplicated_automatic_uploads,
48+
subtitle = R.string.release_notes_4_6_1_subtitle_duplicated_automatic_uploads,
49+
type = ReleaseNoteType.BUGFIX
50+
),
51+
ReleaseNote(
52+
title = R.string.release_notes_4_6_1_title_bearer_token_handling,
53+
subtitle = R.string.release_notes_4_6_1_subtitle_bearer_token_handling,
54+
type = ReleaseNoteType.BUGFIX
55+
),
56+
ReleaseNote(
57+
title = R.string.release_notes_4_6_1_title_shares_space_docs_provider,
58+
subtitle = R.string.release_notes_4_6_1_subtitle_shares_space_docs_provider,
59+
type = ReleaseNoteType.ENHANCEMENT
60+
),
4661
ReleaseNote(
4762
title = R.string.release_notes_bugfixes_title,
4863
subtitle = R.string.release_notes_bugfixes_subtitle,

owncloudApp/src/main/res/values/strings.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,12 @@
737737
<string name="release_notes_icon">Release note icon</string>
738738
<string name="release_notes_bugfixes_title">Minor bugfixes</string>
739739
<string name="release_notes_bugfixes_subtitle">Some bugs were fixed to improve experience in the app</string>
740+
<string name="release_notes_4_6_1_title_shares_space_docs_provider">Shares space in Android native file explorer</string>
741+
<string name="release_notes_4_6_1_subtitle_shares_space_docs_provider">Shares space now appears next to the other spaces in Documents Provider for Infinite Scale accounts</string>
742+
<string name="release_notes_4_6_1_title_duplicated_automatic_uploads">Automatic uploads improved</string>
743+
<string name="release_notes_4_6_1_subtitle_duplicated_automatic_uploads">Automatic uploads are more consistent against duplications</string>
744+
<string name="release_notes_4_6_1_title_bearer_token_handling">Multiple accounts on Infinite Scale servers</string>
745+
<string name="release_notes_4_6_1_subtitle_bearer_token_handling">Multiple accounts can be logged in at the same time on the same Infinite Scale server. Additionally, fixed a problem related with session handling</string>
740746
<!-- Open in web -->
741747
<string name="ic_action_open_in_web">Open in web</string>
742748
<string name="ic_action_open_with_web">Open in %1$s (web)</string>

0 commit comments

Comments
 (0)